Commit ad84a2c8 authored by EKbfh's avatar EKbfh 🐼
Browse files

Merge branch 'EKbfh-master-patch-55860' into 'master'

Update monitoring-noc, add telegraf section

See merge request noc/noc!6236
parents 06902138 6f6f4024
......@@ -228,7 +228,7 @@ py:test:
# Build Docs section
build:Docs:ru:
stage: Test
stage: Build
environment: docs
image: registry.getnoc.com/infrastructure/mkdocs:master
script:
......@@ -241,10 +241,10 @@ build:Docs:ru:
- build/docs/ru
expire_in: 2 hours
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' || '$CI_COMMIT_BRANCH == "master"')
changes:
- "docs/ru/*"
- "docs/ru/**/*"
- "docs/*"
- "docs/**/*"
build:Docs:en:
stage: Build
......@@ -260,10 +260,10 @@ build:Docs:en:
- build/docs/en
expire_in: 2 hours
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: ('$CI_PIPELINE_SOURCE == "merge_request_event"' || '$CI_COMMIT_BRANCH == "master"')
changes:
- "docs/ru/*"
- "docs/ru/**/*"
- "docs/*"
- "docs/**/*"
#Build Image section
build:Release Image:
......@@ -363,10 +363,13 @@ upload docs:
variables:
SOURCE: build/docs/*
DEST: cdn/$S3_BUCKET/$CI_COMMIT_REF_SLUG/
only:
refs:
- master
- /^release-\d+\.\d+/
rules:
- if: ('$CI_PIPELINE_SOURCE == "merge_request_event"')
when: never
- if: ('$CI_COMMIT_BRANCH == "master"')
changes:
- "docs/*"
- "docs/**/*"
upload rust libs:
stage: Upload
......
......@@ -144,7 +144,7 @@ scrape_configs:
static_configs:
- targets: ['vm:8428']
# собираем метрики с ноковских демонов. ищем их через консул
# собираем метрики с ноковских демонов. Дискавери из консула
- job_name: 'noc'
consul_sd_configs:
- server: '<ip-адрес сервера с ноком>:8500' # например 192.168.1.25:8500
......@@ -158,6 +158,21 @@ scrape_configs:
target_label: env
replacement: "dev" # указываем тут тип инсталляции нока
# собираем метрики с telegraf. Дискавери из консула
- job_name: 'telegraf'
consul_sd_configs:
- server: '<ip-адрес сервера с ноком>:8500' # например 192.168.1.25:8500
relabel_configs:
- source_labels: [__meta_consul_tags]
regex: .*,telegraf,.*
action: keep
metric_relabel_configs:
- source_labels: [topic]
regex: correlator.dispose.(.+)
target_label: pool
replacement: '$1'
# собираем метрики с кликхауса
- job_name: 'ch'
scrape_interval: 30s
......@@ -184,10 +199,18 @@ global:
smtp_require_tls: false
route:
group_wait: 30s
group_interval: 5m
repeat_interval: 8h
group_by: [env, node]
receiver: 'prometheus-bot'
routes:
- receiver: blackhole
continue: false
match:
alertname: DeadMansSwitch
- receiver: 'prometheus-bot'
group_interval: 10m
group_interval: 5m
receivers:
- name: 'prometheus-bot'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment