diff --git a/components/nautobot/kustomization.yaml b/components/nautobot/kustomization.yaml index 683f99b59..126e7f695 100644 --- a/components/nautobot/kustomization.yaml +++ b/components/nautobot/kustomization.yaml @@ -4,11 +4,6 @@ kind: Kustomization resources: - job-nautobot-post-deploy.yaml - - job-nautobot-constance-config.yaml - # https://rackspace.atlassian.net/browse/PUC-1485 - - servicemonitor-celery.yaml - - servicemonitor-default.yaml - - rule-nautobot-absent.yaml configMapGenerator: - name: cluster-data diff --git a/components/nautobot/rule-nautobot-absent.yaml b/components/nautobot/rule-nautobot-absent.yaml deleted file mode 100644 index f9af1ead1..000000000 --- a/components/nautobot/rule-nautobot-absent.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: PrometheusRule -metadata: - labels: - app.kubernetes.io/component: nautobot - name: nautobot - namespace: nautobot -spec: - groups: - - name: nautobot - rules: - - alert: NautobotAbsent - annotations: - description: Nautobot has disappeared from Prometheus service discovery. - summary: Nautobot is down. - expr: | - absent(up{job=~".*nautobot.*"} == 1) - for: 5m - labels: - severity: critical diff --git a/components/nautobot/servicemonitor-celery.yaml b/components/nautobot/servicemonitor-celery.yaml deleted file mode 100644 index a045e9e23..000000000 --- a/components/nautobot/servicemonitor-celery.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - labels: - app.kubernetes.io/component: nautobot-celery-default - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot - name: nautobot-celery-default - namespace: nautobot -spec: - endpoints: - - port: workermetrics - selector: - matchLabels: - app.kubernetes.io/component: nautobot-celery-default - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot diff --git a/components/nautobot/servicemonitor-default.yaml b/components/nautobot/servicemonitor-default.yaml deleted file mode 100644 index bcbe1992e..000000000 --- a/components/nautobot/servicemonitor-default.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor -metadata: - labels: - app.kubernetes.io/component: nautobot-default - app.kubernetes.io/instance: nautobot - name: nautobot-default - namespace: nautobot -spec: - scrapeProtocols: - - OpenMetricsText1.0.0 - endpoints: - - interval: 1m - port: http - scrapeTimeout: 30s - selector: - matchLabels: - app.kubernetes.io/component: nautobot-default - app.kubernetes.io/instance: nautobot - app.kubernetes.io/name: nautobot diff --git a/components/nautobot/values.yaml b/components/nautobot/values.yaml index 8c5311298..84abf3732 100644 --- a/components/nautobot/values.yaml +++ b/components/nautobot/values.yaml @@ -91,6 +91,12 @@ redis: ingress: enabled: false -# disabled in favor of explicit definitions through kustomize +# (nicholas.kuechler) seeing something unexpected: +# https://networktocode.slack.com/archives/C01NWPK6WHL/p1736445485521569 metrics: - enabled: false + enabled: true + prometheusRule: + enabled: true + serviceMonitor: + scrapeProtocols: + - OpenMetricsText1.0.0