diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service-monitor.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml similarity index 53% rename from clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service-monitor.yaml rename to clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml index 4c593d9d0..e66ed79c4 100644 --- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service-monitor.yaml +++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/scrape-config.yaml @@ -1,5 +1,5 @@ -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor +apiVersion: monitoring.coreos.com/v1alpha1 +kind: ScrapeConfig metadata: name: node-ps08rp namespace: {{ .Release.Namespace }} @@ -10,19 +10,17 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: {{ .Release.Name }} spec: - selector: - matchLabels: - app.kubernetes.io/name: node-ps08rp - app.kubernetes.io/instance: {{ .Release.Name }} - endpoints: - - targetPort: 9100 - interval: 3m - scrapeTimeout: 1m - path: /metrics + staticConfigs: + - labels: + job: ps08rp + targets: + - ps08rp.alexlebens.net:9100 + metricsPath: /metrics + scheme: HTTP --- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor +apiVersion: monitoring.coreos.com/v1alpha1 +kind: ScrapeConfig metadata: name: node-ps09rp namespace: {{ .Release.Namespace }} @@ -33,19 +31,17 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: {{ .Release.Name }} spec: - selector: - matchLabels: - app.kubernetes.io/name: node-ps09rp - app.kubernetes.io/instance: {{ .Release.Name }} - endpoints: - - targetPort: 9100 - interval: 3m - scrapeTimeout: 1m - path: /metrics + staticConfigs: + - labels: + job: ps08rp + targets: + - ps08rp.alexlebens.net:9100 + metricsPath: /metrics + scheme: HTTP --- -apiVersion: monitoring.coreos.com/v1 -kind: ServiceMonitor +apiVersion: monitoring.coreos.com/v1alpha1 +kind: ScrapeConfig metadata: name: node-ps10rp namespace: {{ .Release.Namespace }} @@ -56,12 +52,10 @@ metadata: app.kubernetes.io/component: metrics app.kubernetes.io/part-of: {{ .Release.Name }} spec: - selector: - matchLabels: - app.kubernetes.io/name: node-ps10rp - app.kubernetes.io/instance: {{ .Release.Name }} - endpoints: - - targetPort: 9100 - interval: 3m - scrapeTimeout: 1m - path: /metrics + staticConfigs: + - labels: + job: ps08rp + targets: + - node-exporter-ps10rp.boreal-beaufort.ts.net + metricsPath: /metrics + scheme: HTTP diff --git a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml index b1cbe7b6b..aa75196ce 100644 --- a/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml +++ b/clusters/cl01tl/monitoring/kube-prometheus-stack/templates/service.yaml @@ -1,37 +1,5 @@ apiVersion: v1 kind: Service -metadata: - name: node-ps08rp - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: node-ps08rp - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: metrics - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - externalName: ps08rp.alexlebens.net - type: ExternalName - ---- -apiVersion: v1 -kind: Service -metadata: - name: node-ps09rp - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: node-ps09rp - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: metrics - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - externalName: ps09rp.alexlebens.net - type: ExternalName - ---- -apiVersion: v1 -kind: Service metadata: name: node-ps10rp namespace: {{ .Release.Namespace }}