From 589ad075caf15ce34af81653fb8d2c4b448c9e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Sun, 9 Jul 2023 22:17:52 +0200 Subject: [PATCH 01/38] Update recording.rules.yml --- prometheus/recording.rules.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/prometheus/recording.rules.yml b/prometheus/recording.rules.yml index 7057da8..8b13789 100644 --- a/prometheus/recording.rules.yml +++ b/prometheus/recording.rules.yml @@ -1,6 +1 @@ -groups: - - name: events - interval: 15s - rules: - - record: - expr: + From 2777b9c01ba489e46a7d76ac80f4c2bf2e1c8a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Sun, 9 Jul 2023 22:50:21 +0200 Subject: [PATCH 02/38] Update prometheus.yml --- prometheus/prometheus.yml | 115 +++++++++++++++++++++++++++++++++++--- 1 file changed, 107 insertions(+), 8 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 3a85d5b..66d990e 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -1,13 +1,112 @@ global: - scrape_interval: 15s + scrape_interval: 15s + scrape_timeout: 10s evaluation_interval: 15s external_labels: - monitor: '' - + environment: prometheus-demo +alerting: + alertmanagers: + - follow_redirects: true + scheme: http + timeout: 10s + api_version: v2 + static_configs: + - targets: + - demo.do.prometheus.io:9093 rule_files: - - 'recording.rules.yml' - +- /etc/prometheus/rules/*.rules scrape_configs: - - job_name: - static_configs: - - targets: [''] +- job_name: prometheus + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + static_configs: + - targets: + - demo.do.prometheus.io:9090 +- job_name: random + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + file_sd_configs: + - files: + - /etc/prometheus/file_sd/random.yml + refresh_interval: 5m +- job_name: caddy + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + static_configs: + - targets: + - localhost:2019 +- job_name: grafana + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + static_configs: + - targets: + - demo.do.prometheus.io:3000 +- job_name: node + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + file_sd_configs: + - files: + - /etc/prometheus/file_sd/node.yml + refresh_interval: 5m +- job_name: alertmanager + honor_timestamps: true + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /metrics + scheme: http + follow_redirects: true + file_sd_configs: + - files: + - /etc/prometheus/file_sd/alertmanager.yml + refresh_interval: 5m +- job_name: blackbox + honor_timestamps: true + params: + module: + - http_2xx + scrape_interval: 15s + scrape_timeout: 10s + metrics_path: /probe + scheme: http + follow_redirects: true + relabel_configs: + - source_labels: [__address__] + separator: ; + regex: (.*) + target_label: __param_target + replacement: $1 + action: replace + - source_labels: [__param_target] + separator: ; + regex: (.*) + target_label: instance + replacement: $1 + action: replace + - separator: ; + regex: (.*) + target_label: __address__ + replacement: 127.0.0.1:9115 + action: replace + static_configs: + - targets: + - http://localhost:9100 From d7b95b8e0cce717abf8c904403a070ca0a000d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:05:35 +0200 Subject: [PATCH 03/38] Update prometheus.yml --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 66d990e..03a21ef 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -16,6 +16,10 @@ alerting: rule_files: - /etc/prometheus/rules/*.rules scrape_configs: +- job_name: prometheus-demo-service + static_configs: + - targets: + - https://prometheus-demo-service.onrender.com:9090 - job_name: prometheus honor_timestamps: true scrape_interval: 15s From 81974a5fa9642fc96b461375bdc4d8287bdfa50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:08:40 +0200 Subject: [PATCH 04/38] Remove https --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 03a21ef..a8ace63 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -19,7 +19,7 @@ scrape_configs: - job_name: prometheus-demo-service static_configs: - targets: - - https://prometheus-demo-service.onrender.com:9090 + - prometheus-demo-service.onrender.com:9090 - job_name: prometheus honor_timestamps: true scrape_interval: 15s From 18908363c4775ff2c3a0487dad1ec1496cb4ce1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Sun, 9 Jul 2023 23:15:09 +0200 Subject: [PATCH 05/38] Try a different port https://community.render.com/t/grafana-and-prometheus-cant-communicate-over-internal-network-but-can-using-the-public-endpoint/3705 --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index a8ace63..665ee8d 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -19,7 +19,7 @@ scrape_configs: - job_name: prometheus-demo-service static_configs: - targets: - - prometheus-demo-service.onrender.com:9090 + - prometheus-demo-service.onrender.com:10000 - job_name: prometheus honor_timestamps: true scrape_interval: 15s From b2c493db6893691d79fd2efeb5794b7193df27c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:33:56 +0200 Subject: [PATCH 06/38] Change port --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 665ee8d..a8ace63 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -19,7 +19,7 @@ scrape_configs: - job_name: prometheus-demo-service static_configs: - targets: - - prometheus-demo-service.onrender.com:10000 + - prometheus-demo-service.onrender.com:9090 - job_name: prometheus honor_timestamps: true scrape_interval: 15s From 464d7b2a4edde6f988ed16e4b0a248af522f8406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Mon, 10 Jul 2023 09:54:45 +0200 Subject: [PATCH 07/38] Remove port --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index a8ace63..f6c5e7f 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -19,7 +19,7 @@ scrape_configs: - job_name: prometheus-demo-service static_configs: - targets: - - prometheus-demo-service.onrender.com:9090 + - prometheus-demo-service.onrender.com - job_name: prometheus honor_timestamps: true scrape_interval: 15s From 22d2f4a9d8fbffcf4f55a24bca89dcc6aee7824e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Tue, 31 Oct 2023 21:58:05 +0100 Subject: [PATCH 08/38] Update prometheus.yml to match with LF course stuff --- prometheus/prometheus.yml | 114 +------------------------------------- 1 file changed, 3 insertions(+), 111 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index f6c5e7f..8be9e3d 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -1,116 +1,8 @@ global: - scrape_interval: 15s - scrape_timeout: 10s - evaluation_interval: 15s - external_labels: - environment: prometheus-demo -alerting: - alertmanagers: - - follow_redirects: true - scheme: http - timeout: 10s - api_version: v2 - static_configs: - - targets: - - demo.do.prometheus.io:9093 -rule_files: -- /etc/prometheus/rules/*.rules + scrape_interval: 5s + evaluation_interval: 5s scrape_configs: -- job_name: prometheus-demo-service - static_configs: - - targets: - - prometheus-demo-service.onrender.com - job_name: prometheus - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - static_configs: - - targets: - - demo.do.prometheus.io:9090 -- job_name: random - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - file_sd_configs: - - files: - - /etc/prometheus/file_sd/random.yml - refresh_interval: 5m -- job_name: caddy - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - static_configs: - - targets: - - localhost:2019 -- job_name: grafana - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - static_configs: - - targets: - - demo.do.prometheus.io:3000 -- job_name: node - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - file_sd_configs: - - files: - - /etc/prometheus/file_sd/node.yml - refresh_interval: 5m -- job_name: alertmanager - honor_timestamps: true - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /metrics - scheme: http - follow_redirects: true - file_sd_configs: - - files: - - /etc/prometheus/file_sd/alertmanager.yml - refresh_interval: 5m -- job_name: blackbox - honor_timestamps: true - params: - module: - - http_2xx - scrape_interval: 15s - scrape_timeout: 10s - metrics_path: /probe - scheme: http - follow_redirects: true - relabel_configs: - - source_labels: [__address__] - separator: ; - regex: (.*) - target_label: __param_target - replacement: $1 - action: replace - - source_labels: [__param_target] - separator: ; - regex: (.*) - target_label: instance - replacement: $1 - action: replace - - separator: ; - regex: (.*) - target_label: __address__ - replacement: 127.0.0.1:9115 - action: replace static_configs: - targets: - - http://localhost:9100 + - prometheus-e83j.onrender.com From 9015ad0f1da3991ae4c30a050bf9e1fb036970d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Tue, 31 Oct 2023 22:30:34 +0100 Subject: [PATCH 09/38] Update prometheus.yml to include demo service --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 8be9e3d..5366666 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -6,3 +6,7 @@ scrape_configs: static_configs: - targets: - prometheus-e83j.onrender.com +- job_name: demo + static_configs: + - targets: + - prometheus-demo-service.onrender.com From e583892c98e532711820baf9ec9b9e4e5bfd1b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:52:00 +0100 Subject: [PATCH 10/38] Add redirector --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 5366666..ada2016 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -10,3 +10,7 @@ scrape_configs: static_configs: - targets: - prometheus-demo-service.onrender.com +- job_name: redirector + static_configs: + - targets: + - https://ux-research-redirector.onrender.com From d2796f3f91b2213e99bac7cd8dc6a01d8fb8943e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:55:03 +0100 Subject: [PATCH 11/38] Fix wrong url --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index ada2016..48ba6cd 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -13,4 +13,4 @@ scrape_configs: - job_name: redirector static_configs: - targets: - - https://ux-research-redirector.onrender.com + - ux-research-redirector.onrender.com From a0337400ca2261238549a9b53cf4906afb714775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:26:58 +0100 Subject: [PATCH 12/38] Add relabeling --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 48ba6cd..ef63b9a 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -6,6 +6,10 @@ scrape_configs: static_configs: - targets: - prometheus-e83j.onrender.com + metric_relabel_configs: + - action:keep + source_labels:[__name__] + regex: '(demo_|http_).*' - job_name: demo static_configs: - targets: From 0b5dba3f0040210ab388aeeea0fa4a6998399921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:29:33 +0100 Subject: [PATCH 13/38] Update relabeling --- prometheus/prometheus.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index ef63b9a..01c1d7e 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -7,9 +7,9 @@ scrape_configs: - targets: - prometheus-e83j.onrender.com metric_relabel_configs: - - action:keep - source_labels:[__name__] - regex: '(demo_|http_).*' + - action: keep + source_labels: [__name__] + regex: '(demo_|http_).*' - job_name: demo static_configs: - targets: From a5328fa74d16280ba1e37f6cdbbb1f88c6cb5ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:33:01 +0100 Subject: [PATCH 14/38] Update relabeling on the right service --- prometheus/prometheus.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 01c1d7e..0a3108f 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -6,14 +6,14 @@ scrape_configs: static_configs: - targets: - prometheus-e83j.onrender.com - metric_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_|http_).*' - job_name: demo static_configs: - targets: - prometheus-demo-service.onrender.com + metric_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_|http_).*' - job_name: redirector static_configs: - targets: From 9516dc1a43dc043b156c1da3e1e93b5ecc2a2585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 13:36:46 +0100 Subject: [PATCH 15/38] Remove other services --- prometheus/prometheus.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 0a3108f..2f3896d 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,10 +2,6 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: -- job_name: prometheus - static_configs: - - targets: - - prometheus-e83j.onrender.com - job_name: demo static_configs: - targets: @@ -14,7 +10,3 @@ scrape_configs: - action: keep source_labels: [__name__] regex: '(demo_|http_).*' -- job_name: redirector - static_configs: - - targets: - - ux-research-redirector.onrender.com From 65b90c830c074e514f367316d045febcba6a9901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:07:51 +0100 Subject: [PATCH 16/38] Remove demo --- prometheus/prometheus.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 2f3896d..8be9e3d 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,11 +2,7 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: -- job_name: demo +- job_name: prometheus static_configs: - targets: - - prometheus-demo-service.onrender.com - metric_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_|http_).*' + - prometheus-e83j.onrender.com From 40273bc1bc3e7e8de5cd7fc8de5032fd1f3644b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:23:20 +0100 Subject: [PATCH 17/38] Remove prometheus and add demo service --- prometheus/prometheus.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 8be9e3d..2f3896d 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,7 +2,11 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: -- job_name: prometheus +- job_name: demo static_configs: - targets: - - prometheus-e83j.onrender.com + - prometheus-demo-service.onrender.com + metric_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_|http_).*' From a9cdc51736f6f00b1ed9494537310233c70670e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:31:26 +0100 Subject: [PATCH 18/38] Return to original config --- prometheus/prometheus.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 2f3896d..e7dbed7 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,11 +2,19 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: -- job_name: demo +- job_name: prometheus static_configs: - targets: - - prometheus-demo-service.onrender.com + - prometheus-e83j.onrender.com metric_relabel_configs: - action: keep source_labels: [__name__] regex: '(demo_|http_).*' +- job_name: demo + static_configs: + - targets: + - prometheus-demo-service.onrender.com +- job_name: redirector + static_configs: + - targets: + - ux-research-redirector.onrender.com From 22998d77a8c72b8b017c5dd02cc67b7800ec5283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:34:44 +0100 Subject: [PATCH 19/38] Update regex --- prometheus/prometheus.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index e7dbed7..6eb7691 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,19 +2,11 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: -- job_name: prometheus - static_configs: - - targets: - - prometheus-e83j.onrender.com - metric_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_|http_).*' - job_name: demo static_configs: - targets: - prometheus-demo-service.onrender.com -- job_name: redirector - static_configs: - - targets: - - ux-research-redirector.onrender.com + metric_relabel_configs: + - action: keep + source_labels: [__name__] + regex: 'demo_.*' From 4789ac376e655581948c2befce933ac639186547 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:43:22 +0100 Subject: [PATCH 20/38] Update regex From b79a44def725a59cbf9a1e22701ee92019ba92cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:51:02 +0100 Subject: [PATCH 21/38] Update relabeling --- prometheus/prometheus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 6eb7691..a087b81 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -7,6 +7,6 @@ scrape_configs: - targets: - prometheus-demo-service.onrender.com metric_relabel_configs: - - action: keep + - action: drop source_labels: [__name__] - regex: 'demo_.*' + regex: 'go_.*' From 6b518bb69a7a62935f1524f2e0356a9b2765290b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 14:55:56 +0100 Subject: [PATCH 22/38] Update relabeling --- prometheus/prometheus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index a087b81..cf27b1f 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -7,6 +7,6 @@ scrape_configs: - targets: - prometheus-demo-service.onrender.com metric_relabel_configs: - - action: drop + - action: keep source_labels: [__name__] - regex: 'go_.*' + regex: prometheus_http_requests_total From c802244bee4e88ccf891d1ff343ed80b2983b206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:07:01 +0100 Subject: [PATCH 23/38] Update prometheus.yml --- prometheus/prometheus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index cf27b1f..d1cdde7 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -7,6 +7,6 @@ scrape_configs: - targets: - prometheus-demo-service.onrender.com metric_relabel_configs: - - action: keep + - action: drop source_labels: [__name__] - regex: prometheus_http_requests_total + regex: '.*' From 1552937f37155e3d66b541be2fb63d6cc1d6295b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:27:12 +0100 Subject: [PATCH 24/38] Update prometheus.yml --- prometheus/prometheus.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index d1cdde7..9733e84 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -2,11 +2,19 @@ global: scrape_interval: 5s evaluation_interval: 5s scrape_configs: +- job_name: prometheus + static_configs: + - targets: + - prometheus-e83j.onrender.com - job_name: demo static_configs: - targets: - prometheus-demo-service.onrender.com metric_relabel_configs: - - action: drop + - action: keep source_labels: [__name__] - regex: '.*' + regex: '(demo_|http_).*' +- job_name: redirector + static_configs: + - targets: + - ux-research-redirector.onrender.com From 7a24dd98f816915077d8f14d107322fc0e40a093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:40:08 +0100 Subject: [PATCH 25/38] Update prometheus.yml --- prometheus/prometheus.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 9733e84..6bf1149 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -18,3 +18,8 @@ scrape_configs: static_configs: - targets: - ux-research-redirector.onrender.com +remote_write: +- url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push + basic_auth: + username: 1495985 + password: SECRET From 4322b93f34c17e987ec247951e22bcdf55745634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 15:47:17 +0100 Subject: [PATCH 26/38] Update prometheus.yml --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 6bf1149..3a84f43 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -22,4 +22,4 @@ remote_write: - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: username: 1495985 - password: SECRET + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" From 5bf455231e04c90c906bbb35a3fb86940fcd3f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:01:33 +0100 Subject: [PATCH 27/38] Update prometheus.yml --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 3a84f43..90bfdf8 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -23,3 +23,7 @@ remote_write: basic_auth: username: 1495985 password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" + metric_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(http_).*' From ff7dd462ee5a105de437a6c70d450052426fe473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:05:04 +0100 Subject: [PATCH 28/38] Update prometheus.yml --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 90bfdf8..fbb8519 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -23,7 +23,7 @@ remote_write: basic_auth: username: 1495985 password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" - metric_relabel_configs: + write_relabel_configs: - action: keep source_labels: [__name__] regex: '(http_).*' From f526466159f728e2d6d794e8bc8b25fdb7e076d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:10:14 +0100 Subject: [PATCH 29/38] Update prometheus.yml --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index fbb8519..0dc9b7f 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -26,4 +26,4 @@ remote_write: write_relabel_configs: - action: keep source_labels: [__name__] - regex: '(http_).*' + regex: '(demo_).*' From 6243e2b1189d3da093aca9624e4a79ee7efe0afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:17:15 +0100 Subject: [PATCH 30/38] Update prometheus.yml --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 0dc9b7f..9dd16b3 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -21,7 +21,7 @@ scrape_configs: remote_write: - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: - username: 1495985 + username: 1496441 password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" write_relabel_configs: - action: keep From c02e29fb0b5f0d4f3510e1bc7597e28665589760 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:27:18 +0100 Subject: [PATCH 31/38] Update prometheus.yml --- prometheus/prometheus.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 9dd16b3..23a7549 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -19,6 +19,14 @@ scrape_configs: - targets: - ux-research-redirector.onrender.com remote_write: +- url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push + basic_auth: + username: 1495985 + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" + write_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_).*' - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: username: 1496441 From 6fd63e1d4c7dfc5e73fe4f81c4a720a32f5c47d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Wed, 27 Mar 2024 16:33:45 +0100 Subject: [PATCH 32/38] Update prometheus.yml --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 23a7549..0f20041 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -30,7 +30,7 @@ remote_write: - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: username: 1496441 - password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1kYXRhLXRyYWlscy10b2tlbjIiLCJrIjoiODJEZ0g2T2ZKODI1cVUxTmh6N2Q5OWZtIiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" write_relabel_configs: - action: keep source_labels: [__name__] From b5e90b21537021af22a1c7cda2d794fae0480a4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 13:57:55 +0100 Subject: [PATCH 33/38] Add new remote write configuration for Grafana --- prometheus/prometheus.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 0f20041..6f7803a 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -18,6 +18,9 @@ scrape_configs: static_configs: - targets: - ux-research-redirector.onrender.com +- job_name: node + static_configs: + - targets: ["localhost:9090"] remote_write: - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: @@ -34,4 +37,8 @@ remote_write: write_relabel_configs: - action: keep source_labels: [__name__] - regex: '(demo_).*' + regex: '(demo_).*' +- url: https://prometheus-prod-65-prod-eu-west-2.grafana.net/api/prom/push + basic_auth: + username: 2844985 + password: REMOTE_WRITE From 2d43e36ba64cd83bcdd370537b1d1a9f7a40263b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:03:26 +0100 Subject: [PATCH 34/38] Change Prometheus remote write password Updated the password for the Prometheus remote write configuration. --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 6f7803a..b585ea8 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -41,4 +41,4 @@ remote_write: - url: https://prometheus-prod-65-prod-eu-west-2.grafana.net/api/prom/push basic_auth: username: 2844985 - password: REMOTE_WRITE + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InN0YWNrLTE0NjAzNzYtYWxsb3ktaG9zdGVkLXByb21ldGhldXMtdG9rZW4iLCJrIjoiYzVNNjlZWGdzQTBrOXg1eloxczY4TjdIIiwibSI6eyJyIjoicHJvZC1ldS13ZXN0LTIifX0=" From cb04102db3369134174e8621777953a9b0269263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:08:00 +0100 Subject: [PATCH 35/38] Add Pushgateway job configuration to Prometheus --- prometheus/prometheus.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index b585ea8..8c28c05 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -10,6 +10,10 @@ scrape_configs: static_configs: - targets: - prometheus-demo-service.onrender.com + - job_name: 'pushgateway' + honor_labels: true + static_configs: + - targets: ['https://pushgateway-1wrl.onrender.com'] metric_relabel_configs: - action: keep source_labels: [__name__] From 0b5f4320d4dffca2fc9836b9060b3ede78323589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:11:25 +0100 Subject: [PATCH 36/38] Reorganize pushgateway job configuration --- prometheus/prometheus.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 8c28c05..47ff825 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -10,10 +10,6 @@ scrape_configs: static_configs: - targets: - prometheus-demo-service.onrender.com - - job_name: 'pushgateway' - honor_labels: true - static_configs: - - targets: ['https://pushgateway-1wrl.onrender.com'] metric_relabel_configs: - action: keep source_labels: [__name__] @@ -25,6 +21,12 @@ scrape_configs: - job_name: node static_configs: - targets: ["localhost:9090"] +- job_name: 'pushgateway' + honor_labels: true + static_configs: + - targets: ['https://pushgateway-1wrl.onrender.com'] + labels: + instance: '' remote_write: - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push basic_auth: From 974f9583130b4faaa3c178d58aac72925618a4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:18:35 +0100 Subject: [PATCH 37/38] Update Pushgateway target URL to include /metrics --- prometheus/prometheus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 47ff825..6749c0e 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -24,7 +24,7 @@ scrape_configs: - job_name: 'pushgateway' honor_labels: true static_configs: - - targets: ['https://pushgateway-1wrl.onrender.com'] + - targets: ['https://pushgateway-1wrl.onrender.com/metrics'] labels: instance: '' remote_write: From affac6fdc8f3b851bcd4877cee25e4c759635cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Kiripolsk=C3=BD?= <4126171+AndrejKiri@users.noreply.github.com> Date: Fri, 5 Dec 2025 14:22:59 +0100 Subject: [PATCH 38/38] Refactor prometheus.yml for better structure --- prometheus/prometheus.yml | 101 +++++++++++++++++++++----------------- 1 file changed, 56 insertions(+), 45 deletions(-) diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 6749c0e..0d14e01 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -1,50 +1,61 @@ global: scrape_interval: 5s evaluation_interval: 5s + scrape_configs: -- job_name: prometheus - static_configs: - - targets: - - prometheus-e83j.onrender.com -- job_name: demo - static_configs: - - targets: - - prometheus-demo-service.onrender.com - metric_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_|http_).*' -- job_name: redirector - static_configs: - - targets: - - ux-research-redirector.onrender.com -- job_name: node - static_configs: - - targets: ["localhost:9090"] -- job_name: 'pushgateway' - honor_labels: true - static_configs: - - targets: ['https://pushgateway-1wrl.onrender.com/metrics'] - labels: - instance: '' + - job_name: prometheus + static_configs: + - targets: + - prometheus-e83j.onrender.com + + - job_name: demo + static_configs: + - targets: + - prometheus-demo-service.onrender.com + metric_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_|http_).*' + + - job_name: redirector + static_configs: + - targets: + - ux-research-redirector.onrender.com + + - job_name: node + static_configs: + - targets: + - localhost:9090 + + - job_name: 'pushgateway' + honor_labels: true + scheme: https + static_configs: + - targets: + - pushgateway-1wrl.onrender.com + labels: + instance: '' + remote_write: -- url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push - basic_auth: - username: 1495985 - password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" - write_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_).*' -- url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push - basic_auth: - username: 1496441 - password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1kYXRhLXRyYWlscy10b2tlbjIiLCJrIjoiODJEZ0g2T2ZKODI1cVUxTmh6N2Q5OWZtIiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" - write_relabel_configs: - - action: keep - source_labels: [__name__] - regex: '(demo_).*' -- url: https://prometheus-prod-65-prod-eu-west-2.grafana.net/api/prom/push - basic_auth: - username: 2844985 - password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InN0YWNrLTE0NjAzNzYtYWxsb3ktaG9zdGVkLXByb21ldGhldXMtdG9rZW4iLCJrIjoiYzVNNjlZWGdzQTBrOXg1eloxczY4TjdIIiwibSI6eyJyIjoicHJvZC1ldS13ZXN0LTIifX0=" + - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push + basic_auth: + username: 1495985 + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1mb3ItZGF0YS10cmFpbHMtc2hvcnQtdG9rZW4iLCJrIjoia0NoaTE3ZGZnOG0wZHo5ME5maDcyYTI1IiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" + write_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_).*' + + - url: https://prometheus-prod-13-prod-us-east-0.grafana.net/api/prom/push + basic_auth: + username: 1496441 + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InJlbW90ZS13cml0ZS1kYXRhLXRyYWlscy10b2tlbjIiLCJrIjoiODJEZ0g2T2ZKODI1cVUxTmh6N2Q5OWZtIiwibSI6eyJyIjoicHJvZC11cy1lYXN0LTAifX0=" + write_relabel_configs: + - action: keep + source_labels: [__name__] + regex: '(demo_).*' + + - url: https://prometheus-prod-65-prod-eu-west-2.grafana.net/api/prom/push + basic_auth: + username: 2844985 + password: "glc_eyJvIjoiNjk0NTU5IiwibiI6InN0YWNrLTE0NjAzNzYtYWxsb3ktaG9zdGVkLXByb21ldGhldXMtdG9rZW4iLCJrIjoiYzVNNjlZWGdzQTBrOXg1eloxczY4TjdIIiwibSI6eyJyIjoicHJvZC1ldS13ZXN0LTIifX0="