Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
icinga
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
monitoring
icinga
Commits
c43bf7f0
Commit
c43bf7f0
authored
3 years ago
by
Marek Jaroš
Browse files
Options
Downloads
Patches
Plain Diff
Icinga v2.13.2
parent
6ac8c7e6
No related branches found
No related tags found
1 merge request
!5
Icinga v 2.13.2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
Dockerfile
+9
-7
9 additions, 7 deletions
Dockerfile
content/opt/setup/70-icinga2-influxdb
+1
-1
1 addition, 1 deletion
content/opt/setup/70-icinga2-influxdb
docker-compose.yml
+0
-2
0 additions, 2 deletions
docker-compose.yml
with
11 additions
and
11 deletions
.gitlab-ci.yml
+
1
−
1
View file @
c43bf7f0
...
...
@@ -10,7 +10,7 @@ before_script:
build-stable
:
stage
:
build
script
:
-
/kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.
1
-
/kaniko/executor --cache=true --cache-copy-layers --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --build-arg NAME=$CI_PROJECT_NAME --build-arg BUILD_DATE=`date -u +"%d-%m-%Y-T%H:%M:%S%Z"` --build-arg VCS_REF=$CI_COMMIT_SHORT_SHA --build-arg VCS_URL=$CI_PROJECT_URL --destination $CI_REGISTRY_IMAGE:stable --destination $CI_REGISTRY_IMAGE:2 --destination $CI_REGISTRY_IMAGE:2.13 --destination $CI_REGISTRY_IMAGE:2.13.
2
only
:
-
stable
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
9
−
7
View file @
c43bf7f0
...
...
@@ -6,7 +6,7 @@ RUN printf "Running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATF
# Basic info
ARG
NAME
ARG
BUILD_DATE
ARG
VERSION=2.13.
1
ARG
VERSION=2.13.
2
ARG
VCS_REF
ARG
VCS_URL
...
...
@@ -22,6 +22,7 @@ LABEL maintainer="Marek Jaroš <jaros@ics.muni.cz>" \
org.label-schema.schema-version="1.0"
ENV
CODENAME=bullseye
ENV
PACKAGE=2.13.2-1.${CODENAME}
ENV
LANG=en_US.UTF-8 LANGUAGE=en_US:en
# Prepare environment
...
...
@@ -83,6 +84,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
libconfig-inifiles-perl
\
libnumber-format-perl
\
libdatetime-perl
\
libldap-common
\
fping
\
squidclient
\
rsyslog
\
...
...
@@ -98,14 +100,14 @@ COPY content/ /
RUN
export
DEBIAN_FRONTEND
=
noninteractive
\
&&
curl
-s
https://packages.icinga.com/icinga.key | gpg
--dearmor
>
/usr/share/keyrings/icinga-keyring.gpg
\
&&
curl
-s
https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg
--dearmor
>
/usr/share/keyrings/postgres-keyring.gpg
\
&&
echo
"deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-
$CODENAME
main"
>
/etc/apt/sources.list.d/icinga2.list
\
&&
echo
"deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/
$CODENAME
-pgdg main"
>
/etc/apt/sources.list.d/
$CODENAME
-pgdg
.list
\
&&
echo
"deb [signed-by=/usr/share/keyrings/icinga-keyring.gpg] https://packages.icinga.com/debian icinga-
$
{
CODENAME
}
main"
>
/etc/apt/sources.list.d/icinga2.list
\
&&
echo
"deb [signed-by=/usr/share/keyrings/postgres-keyring.gpg] https://apt.postgresql.org/pub/repos/apt/
$
{
CODENAME
}
-pgdg main"
>
/etc/apt/sources.list.d/
$
{
CODENAME
}
-pgdg
.list
\
&&
apt-get update
\
&&
apt-get
install
-y
-f
--no-install-recommends
-o
DPkg::options::
=
"--force-unsafe-io"
\
icinga2
\
icinga2-bin
\
icinga2-common
\
icinga2-ido-pgsql
\
icinga2
=
${
PACKAGE
}
\
icinga2-bin
=
${
PACKAGE
}
\
icinga2-common
=
${
PACKAGE
}
\
icinga2-ido-pgsql
=
${
PACKAGE
}
\
postgresql-client-13
\
monitoring-plugins
\
monitoring-plugins-contrib
\
...
...
This diff is collapsed.
Click to expand it.
content/opt/setup/70-icinga2-influxdb
+
1
−
1
View file @
c43bf7f0
...
...
@@ -11,7 +11,7 @@ if evaluate_boolean "${ICINGA2_FEATURE_INFLUXDB}"; then
ICINGA2_FEATURE_INFLUXDB_DB
=
${
ICINGA2_FEATURE_INFLUXDB_DB
:-
icinga2_db
}
ICINGA2_FEATURE_INFLUXDB_USER
=
${
ICINGA2_FEATURE_INFLUXDB_USER
:-
icinga2
}
ICINGA2_FEATURE_INFLUXDB_PASS
=
${
ICINGA2_FEATURE_INFLUXDB_PASS
}
ICINGA2_FEATURE_INFLUXDB_SSL
=
${
ICINGA2_FEATURE_INFLUXDB_SSL
:-
T
rue
}
ICINGA2_FEATURE_INFLUXDB_SSL
=
${
ICINGA2_FEATURE_INFLUXDB_SSL
:-
t
rue
}
echo
"InfluxDB: Enabling Icinga2 InfluxDB writer"
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
0
−
2
View file @
c43bf7f0
...
...
@@ -24,7 +24,6 @@ services:
hostname
:
pgsql
container_name
:
pgsql
restart
:
always
mem_swappiness
:
0
networks
:
icinet
:
environment
:
...
...
@@ -35,7 +34,6 @@ services:
container_name
:
icinga
restart
:
always
hostname
:
'
icinga'
mem_swappiness
:
0
networks
:
icinet
:
ports
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment