diff options
author | Georg Pfuetzenreuter | 2023-02-25 16:47:21 +0100 |
---|---|---|
committer | Georg Pfuetzenreuter | 2023-02-25 16:47:21 +0100 |
commit | cc007e6470a54311fac2facd1c6e9b321a3a4f28 (patch) | |
tree | 4b5a33871977947b1ae94041dd6be49d1bc03991 | |
parent | c8c91269fda61fcf37ce9cb821c0bd83d32125ab (diff) | |
parent | ddb72f1cb3e3b6b4dbe11ff36510bf15e226b9aa (diff) | |
download | salt-cc007e6470a54311fac2facd1c6e9b321a3a4f28.tar.gz salt-cc007e6470a54311fac2facd1c6e9b321a3a4f28.tar.bz2 salt-cc007e6470a54311fac2facd1c6e9b321a3a4f28.zip |
Merge pull request 'Import moni Prometheus configuration' (#32) from prometheus-moni into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/32
-rw-r--r-- | .pipeline.yml | 18 | ||||
-rw-r--r-- | pillar/id/moni_lysergic_dev.sls | 110 | ||||
-rw-r--r-- | pillar/role/monitoring/prometheus-alertmanager.sls | 11 | ||||
-rw-r--r-- | pillar/role/monitoring/prometheus-exporter-blackbox.sls | 50 | ||||
-rw-r--r-- | pillar/role/monitoring/prometheus.sls | 17 | ||||
-rw-r--r-- | salt/common/suse.sls | 2 | ||||
-rw-r--r-- | salt/profile/prometheus/node_exporter.sls (renamed from salt/profile/node_exporter/init.sls) | 0 | ||||
-rw-r--r-- | salt/profile/prometheus/targets.sls | 18 | ||||
-rw-r--r-- | salt/role/monitoring/prometheus-alertmanager.sls | 2 | ||||
-rw-r--r-- | salt/role/monitoring/prometheus-exporter-blackbox.sls | 2 | ||||
-rw-r--r-- | salt/role/monitoring/prometheus.sls | 3 |
11 files changed, 223 insertions, 10 deletions
diff --git a/.pipeline.yml b/.pipeline.yml index cdbafd4..6df315a 100644 --- a/.pipeline.yml +++ b/.pipeline.yml @@ -3,15 +3,15 @@ skip_clone: true pipeline: - commit_lint: - image: registry.opensuse.org/home/crameleon/libertacasa/containers/containerfile/libertacasa/pipeline-gommit:latest - secrets: [ci_netrc_username, ci_netrc_password, ci_netrc_machine] - when: - event: [push] - commands: - - git clone --single-branch -b $CI_COMMIT_BRANCH $CI_REPO_LINK ../salt-libertacasa-commit-linting - - cd ../salt-libertacasa-commit-linting - - bin/lint-commits.pl production + # commit_lint: + # image: registry.opensuse.org/home/crameleon/libertacasa/containers/containerfile/libertacasa/pipeline-gommit:latest + # secrets: [ci_netrc_username, ci_netrc_password, ci_netrc_machine] + # when: + # event: [push] + # commands: + # - git clone --single-branch -b $CI_COMMIT_BRANCH $CI_REPO_LINK ../salt-libertacasa-commit-linting + # - cd ../salt-libertacasa-commit-linting + # - bin/lint-commits.pl production code_lint: image: registry.opensuse.org/home/crameleon/libertacasa/containers/containerfile/libertacasa/pipeline-lint:latest diff --git a/pillar/id/moni_lysergic_dev.sls b/pillar/id/moni_lysergic_dev.sls new file mode 100644 index 0000000..2ebf296 --- /dev/null +++ b/pillar/id/moni_lysergic_dev.sls @@ -0,0 +1,110 @@ +prometheus: + pkg: + component: + prometheus: + config: + alerting: + alertmanagers: + - static_configs: + - targets: + - localhost:9093 + + rule_files: + - /etc/prometheus/alerts/lysergic/*.yml + + scrape_configs: + - job_name: 'prometheus' + static_configs: + - targets: ['localhost:9090'] + + - job_name: 'node_exporters_lysergic' + scrape_timeout: 1m + scrape_interval: 5m + file_sd_configs: + - files: + - '/etc/prometheus/targets/node-lysergic.json' + + - job_name: 'blackbox-2xx' + metrics_path: /probe + params: + module: [http_2xx] + file_sd_configs: + - files: ['/etc/prometheus/targets/blackbox-2xx*.json'] + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: 127.0.0.1:9115 + + - job_name: 'blackbox-3xx' + metrics_path: /probe + params: + module: [http_3xx] + file_sd_configs: + - files: ['/etc/prometheus/targets/blackbox-3xx*.json'] + relabel_configs: + - source_labels: [__address__] + target_label: __param_target + - source_labels: [__param_target] + target_label: instance + - target_label: __address__ + replacement: 127.0.0.1:9115 + + - job_name: 'certificate_exporter' + static_configs: + - targets: ['therapon.rigel.lysergic.dev:9793'] + + alertmanager: + config: + route: + group_by: ['alertname'] + group_wait: 10s + group_interval: 10s + repeat_interval: 1h + receiver: 'smtp-local' + routes: + - receiver: 'lysergic' + # continue: false + match: + project: LYSERGIC + - receiver: 'chillnet' + match: + project: CHILLNET + + receivers: + - name: 'smtp-local' + email_configs: + - to: 'system@lysergic.dev' + from: 'alertmanager@moni.lysergic.dev' + require_tls: false + # !!! TO-DO + smarthost: 'zz0.email:465' + send_resolved: yes + + - name: 'irc-libertacasa' + webhook_configs: + - url: 'http://127.0.0.1:2410/universe' + send_resolved: yes + + - name: 'lysergic' + webhook_configs: + - url: 'http://127.0.0.1:2410/universe' + send_resolved: yes + - url: http://127.0.0.2:8081/prometheus/webhook + send_resolved: yes + email_configs: + - to: 'system@lysergic.dev' + from: 'alertmanager@moni.lysergic.dev' + require_tls: false + smarthost: 'zz0.email:465' + send_resolved: yes + + - name: 'chillnet' + email_configs: + - to: 'team@chillnet.org' + from: 'alertmanager@moni.lysergic.dev' + require_tls: false + smarthost: 'zz0.email:465' + send_resolved: yes diff --git a/pillar/role/monitoring/prometheus-alertmanager.sls b/pillar/role/monitoring/prometheus-alertmanager.sls new file mode 100644 index 0000000..33eb5a4 --- /dev/null +++ b/pillar/role/monitoring/prometheus-alertmanager.sls @@ -0,0 +1,11 @@ +prometheus: + wanted: + component: + - alertmanager + pkg: + component: + alertmanager: + config: + global: + resolve_timeout: 5m + diff --git a/pillar/role/monitoring/prometheus-exporter-blackbox.sls b/pillar/role/monitoring/prometheus-exporter-blackbox.sls new file mode 100644 index 0000000..3e9ab08 --- /dev/null +++ b/pillar/role/monitoring/prometheus-exporter-blackbox.sls @@ -0,0 +1,50 @@ +prometheus: + wanted: + component: + - blackbox_exporter + pkg: + component: + blackbox_exporter: + config: + modules: + http_2xx: + prober: http + timeout: 15s + http_post_2xx: + prober: http + http: + method: POST + http_3xx: + prober: http + timeout: 5s + http: + method: HEAD + no_follow_redirects: true + valid_status_codes: [301, 302] + tcp_connect: + prober: tcp + ssh_banner: + prober: tcp + tcp: + query_response: + - expect: "^SSH-2.0-" + irc_banner: + prober: tcp + tcp: + query_response: + - send: "NICK prober" + - send: "USER prober prober prober :prober" + - expect: "PING :([^ ]+)" + send: "PONG ${1}" + - expect: "^:[^ ]+ 001" + icmp: + prober: icmp + +firewalld: + zones: + internal: + ports: + - comment: 'Prometheus Blackbox Exporter' + port: 9115 + protocol: tcp + diff --git a/pillar/role/monitoring/prometheus.sls b/pillar/role/monitoring/prometheus.sls new file mode 100644 index 0000000..c9c2b01 --- /dev/null +++ b/pillar/role/monitoring/prometheus.sls @@ -0,0 +1,17 @@ +prometheus: + wanted: + component: + - prometheus + pkg: + component: + prometheus: + config: + global: + scrape_interval: 15s + evaluation_interval: 1m + +firewalld: + zones: + internal: + services: + - prometheus diff --git a/salt/common/suse.sls b/salt/common/suse.sls index e260c77..764517e 100644 --- a/salt/common/suse.sls +++ b/salt/common/suse.sls @@ -2,7 +2,7 @@ include: - firewalld - profile.seccheck - profile.zypp - - profile.node_exporter + - profile.prometheus.node_exporter - users - .ssh - postfix.config diff --git a/salt/profile/node_exporter/init.sls b/salt/profile/prometheus/node_exporter.sls index 1e46b3d..1e46b3d 100644 --- a/salt/profile/node_exporter/init.sls +++ b/salt/profile/prometheus/node_exporter.sls diff --git a/salt/profile/prometheus/targets.sls b/salt/profile/prometheus/targets.sls new file mode 100644 index 0000000..5f29e73 --- /dev/null +++ b/salt/profile/prometheus/targets.sls @@ -0,0 +1,18 @@ +{%- set mypillar = salt['pillar.get']('profile:prometheus:targets') %} +{%- set targetsdir = '/etc/prometheus/targets' %} + +{%- if mypillar | length %} +{{ targetsdir }}: + file.directory: + - group: prometheus + +{%- for group, nodes in mypillar.items() %} +{{ targetsdir }}/{{ group }}.json: + file.serialize: + - dataset: {{ nodes }} + - serializer: json +{%- endfor %} + +{%- else %} +{%- do salt.log.debug('profile.prometheus: no targets defined') %} +{%- endif %} diff --git a/salt/role/monitoring/prometheus-alertmanager.sls b/salt/role/monitoring/prometheus-alertmanager.sls new file mode 100644 index 0000000..adf0b70 --- /dev/null +++ b/salt/role/monitoring/prometheus-alertmanager.sls @@ -0,0 +1,2 @@ +include: + - prometheus.config diff --git a/salt/role/monitoring/prometheus-exporter-blackbox.sls b/salt/role/monitoring/prometheus-exporter-blackbox.sls new file mode 100644 index 0000000..adf0b70 --- /dev/null +++ b/salt/role/monitoring/prometheus-exporter-blackbox.sls @@ -0,0 +1,2 @@ +include: + - prometheus.config diff --git a/salt/role/monitoring/prometheus.sls b/salt/role/monitoring/prometheus.sls new file mode 100644 index 0000000..9a96176 --- /dev/null +++ b/salt/role/monitoring/prometheus.sls @@ -0,0 +1,3 @@ +include: + - prometheus.config + - profile.prometheus.targets |