Skip to content

[monitoring] Add back self-monitoring of prometheus #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barroco merged 3 commits into from
Jan 20, 2026
Merged

[monitoring] Add back self-monitoring of prometheus #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6569b8c
[monitoring] Add back self-monitoring of prometheus
the-glu Jan 20, 2026
349f462
Fixes for PR
the-glu Jan 20, 2026
a2735da
Apply suggestions from code review
barroco Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion deploy/services/helm-charts/dss/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ prometheus:
evaluation_interval: 5s

podAnnotations:
serverFilesVersion: "2" # Since the prometheus helm chart does not detect changes in server files, this value is used to force the redeployment following the update of the serverFiles defined below.
serverFilesVersion: "3" # Since the prometheus helm chart does not detect changes in server files, this value is used to force the redeployment following the update of the serverFiles defined below.

extraFlags:
- "web.config.file=/etc/config/web-config.yml"
Expand Down Expand Up @@ -119,6 +119,16 @@ prometheus:

prometheus.yml:
scrape_configs:
- job_name: 'prometheus'
scheme: 'https'
tls_config:
ca_file: '/certs/ca.crt'
cert_file: '/certs/node.crt'
key_file: '/certs/node.key'
insecure_skip_verify: true # Don't verify as it's localhost (so it's safe) and hostname doesn't match
static_configs:
- targets:
- '127.0.0.1:9090'
- job_name: K8s-Endpoints
tls_config:
insecure_skip_verify: true
Expand Down
6 changes: 3 additions & 3 deletions deploy/services/tanka/prometheus.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
local base = import 'base.libsonnet';
local k8sEndpoints = import 'prometheus_configs/k8s-endpoints.libsonnet';
local scrapeConfigs = import 'prometheus_configs/scrape-configs.libsonnet';
local crdbAggregation = import 'prometheus_configs/crdb-aggregation.libsonnet';


Expand All @@ -17,7 +17,7 @@ local PrometheusConfig(metadata) = {
'aggregation.rules.yml',
'custom.rules.yml',
],
scrape_configs: k8sEndpoints.scrape_configs,
scrape_configs: scrapeConfigs.scrape_configs,
};

local PrometheusWebConfig(metadata) = {
Expand Down Expand Up @@ -137,7 +137,7 @@ local externalLB(metadata, name, ip) =
annotations+: {
"checksum/config": std.native('sha256')(std.manifestJson(PrometheusConfig(metadata))),
"checksum/webconfig": std.native('sha256')(std.manifestJson(PrometheusWebConfig(metadata))),
"checksum/k8sEndpoints": std.native('sha256')(std.manifestJson(k8sEndpoints)),
"checksum/scrapeConfigs": std.native('sha256')(std.manifestJson(scrapeConfigs)),
"checksum/crdbAggregation": std.native('sha256')(std.manifestJson(crdbAggregation)),
},
},
Expand Down
17 changes: 17 additions & 0 deletions ...rometheus_configs/k8s-endpoints.libsonnet → ...ometheus_configs/scrape-configs.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,22 @@
{
scrape_configs: [
{
job_name: 'prometheus',
scheme: 'https',
tls_config: {
ca_file: '/certs/ca.crt',
cert_file: '/certs/node.crt',
key_file: '/certs/node.key',
insecure_skip_verify: true, # Don't verify as it's localhost (so it's safe) and hostname doesn't match
},
static_configs: [
{
targets: [
'127.0.0.1:9090',
]
},
],
},
{
job_name: 'K8s-Endpoints',
kubernetes_sd_configs: [
Expand Down
Loading