Skip to content
Snippets Groups Projects
Unverified Commit 0c1bb5c1 authored by Frederic Branczyk's avatar Frederic Branczyk
Browse files

manifests: remove prometheus.io/scrape annotations

These annotations made sense in pre v1.3.0 Prometheus releases, however,
with >=v1.3.0 and the Prometheus Operator these annotations are more
confusing then helpful.
parent 20f88eed
No related branches found
No related tags found
No related merge requests found
...@@ -43,10 +43,6 @@ To tear it all down again, run: ...@@ -43,10 +43,6 @@ To tear it all down again, run:
hack/cluster-monitoring/teardown hack/cluster-monitoring/teardown
``` ```
> All services in the manifest still contain the `prometheus.io/scrape = true`
> annotations. It is not used by the Prometheus Operator. They remain for
> pre Prometheus v1.3.0 deployments as in [this example configuration](https://github.com/prometheus/prometheus/blob/6703404cb431f57ca4c5097bc2762438d3c1968e/documentation/examples/prometheus-kubernetes.yml).
## Monitoring custom services ## Monitoring custom services
The example manifests in [/manifests/examples/example-app](/manifests/examples/example-app) The example manifests in [/manifests/examples/example-app](/manifests/examples/example-app)
...@@ -133,4 +129,4 @@ default kubernetes 172.17.4.101:443 ...@@ -133,4 +129,4 @@ default kubernetes 172.17.4.101:443
kube-system kube-controller-manager-prometheus-discovery 10.2.30.2:10252 1h kube-system kube-controller-manager-prometheus-discovery 10.2.30.2:10252 1h
kube-system kube-scheduler-prometheus-discovery 10.2.30.4:10251 1h kube-system kube-scheduler-prometheus-discovery 10.2.30.4:10251 1h
monitoring etcd-k8s 172.17.4.51:2379 1h monitoring etcd-k8s 172.17.4.51:2379 1h
``` ```
\ No newline at end of file
...@@ -5,8 +5,6 @@ metadata: ...@@ -5,8 +5,6 @@ metadata:
labels: labels:
app: etcd app: etcd
etcd: k8s etcd: k8s
annotations:
prometheus.io/scrape: 'true'
spec: spec:
type: ClusterIP type: ClusterIP
clusterIP: None clusterIP: None
...@@ -29,4 +27,4 @@ subsets: ...@@ -29,4 +27,4 @@ subsets:
ports: ports:
- name: api - name: api
port: 2379 port: 2379
protocol: TCP protocol: TCP
\ No newline at end of file
...@@ -5,8 +5,6 @@ metadata: ...@@ -5,8 +5,6 @@ metadata:
labels: labels:
app: etcd app: etcd
etcd: k8s etcd: k8s
annotations:
prometheus.io/scrape: 'true'
spec: spec:
type: ClusterIP type: ClusterIP
clusterIP: None clusterIP: None
...@@ -29,4 +27,4 @@ subsets: ...@@ -29,4 +27,4 @@ subsets:
ports: ports:
- name: api - name: api
port: 2379 port: 2379
protocol: TCP protocol: TCP
\ No newline at end of file
...@@ -4,8 +4,6 @@ metadata: ...@@ -4,8 +4,6 @@ metadata:
name: example-app name: example-app
labels: labels:
tier: frontend tier: frontend
annotations:
prometheus.io/scrape: 'true'
spec: spec:
selector: selector:
app: example-app app: example-app
......
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations:
prometheus.io/scrape: 'true'
labels: labels:
app: kube-state-metrics app: kube-state-metrics
name: kube-state-metrics name: kube-state-metrics
......
...@@ -3,8 +3,6 @@ kind: Service ...@@ -3,8 +3,6 @@ kind: Service
metadata: metadata:
labels: labels:
app: node-exporter app: node-exporter
annotations:
prometheus.io/scrape: 'true'
name: node-exporter name: node-exporter
spec: spec:
type: ClusterIP type: ClusterIP
......
...@@ -4,8 +4,6 @@ metadata: ...@@ -4,8 +4,6 @@ metadata:
name: grafana name: grafana
labels: labels:
app: grafana app: grafana
annotations:
prometheus.io/scrape: 'true'
spec: spec:
type: NodePort type: NodePort
ports: ports:
...@@ -14,4 +12,4 @@ spec: ...@@ -14,4 +12,4 @@ spec:
protocol: TCP protocol: TCP
nodePort: 30902 nodePort: 30902
selector: selector:
app: grafana app: grafana
\ No newline at end of file
...@@ -4,8 +4,6 @@ metadata: ...@@ -4,8 +4,6 @@ metadata:
name: kube-controller-manager-prometheus-discovery name: kube-controller-manager-prometheus-discovery
labels: labels:
k8s-app: kube-controller-manager k8s-app: kube-controller-manager
annotations:
prometheus.io/scrape: 'true'
spec: spec:
selector: selector:
k8s-app: kube-controller-manager k8s-app: kube-controller-manager
......
...@@ -4,8 +4,6 @@ metadata: ...@@ -4,8 +4,6 @@ metadata:
name: kube-scheduler-prometheus-discovery name: kube-scheduler-prometheus-discovery
labels: labels:
k8s-app: kube-scheduler k8s-app: kube-scheduler
annotations:
prometheus.io/scrape: 'true'
spec: spec:
selector: selector:
k8s-app: kube-scheduler k8s-app: kube-scheduler
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment