Skip to content
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.

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

istio: Remove "kubernetes-service-monitor" service monitor #767

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion staging/istio/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1
name: istio
version: 1.6.6
version: 1.6.7
appVersion: 1.6.3
tillerVersion: ">=2.7.2-0"
description: Helm chart for istio
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,48 +75,3 @@ spec:
- sourceLabels: [__meta_kubernetes_pod_name]
action: replace
targetLabel: pod_name
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: kubernetes-services-monitor
namespace: {{ .Release.Namespace }}
labels:
monitoring: kube-services
release: prometheus-kubeaddons
spec:
selector:
matchExpressions:
- {key: istio-prometheus-ignore, operator: DoesNotExist}
namespaceSelector:
any: true
jobLabel: kubernetes-services
endpoints:
- interval: {{ .Values.scrapeInterval }}
relabelings:
- sourceLabels: [__meta_kubernetes_service_annotation_prometheus_io_scrape]
action: keep
regex: 'true'
- sourceLabels: [__meta_kubernetes_pod_annotation_sidecar_istio_io_status, __meta_kubernetes_service_annotation_prometheus_io_scheme]
action: keep
regex: '((;.*)|(.*;http)|(.??))'
- sourceLabels: [__meta_kubernetes_pod_annotation_istio_mtls]
action: drop
regex: 'true'
- sourceLabels: [__meta_kubernetes_service_annotation_prometheus_io_path]
action: replace
targetLabel: __metrics_path__
regex: '(.+)'
- sourceLabels: [__address__, __meta_kubernetes_service_annotation_prometheus_io_port]
action: replace
regex: '([^:]+)(?::\d+)?;(\d+)'
replacement: $1:$2
targetLabel: __address__
- action: labelmap
regex: '__meta_kubernetes_pod_label_(.+)'
- sourceLabels: [__meta_kubernetes_namespace]
action: replace
targetLabel: namespace
- sourceLabels: [__meta_kubernetes_pod_name]
action: replace
targetLabel: pod_name