diff --git a/README.md b/README.md index 044979881701bf94011dc08a67920a2b9f812e4b..4520d923358b905a1e14a682c10e95731d4b5f22 100644 --- a/README.md +++ b/README.md @@ -43,10 +43,6 @@ To tear it all down again, run: 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 The example manifests in [/manifests/examples/example-app](/manifests/examples/example-app) @@ -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-scheduler-prometheus-discovery 10.2.30.4:10251 1h monitoring etcd-k8s 172.17.4.51:2379 1h -``` \ No newline at end of file +``` diff --git a/manifests/etcd/etcd-bootkube-gce.yaml b/manifests/etcd/etcd-bootkube-gce.yaml index 542f5fe7edacb191592268c55f3f26d13e5220a1..ee8f391ce19ed3568fbd004326a522cc95f95255 100644 --- a/manifests/etcd/etcd-bootkube-gce.yaml +++ b/manifests/etcd/etcd-bootkube-gce.yaml @@ -5,8 +5,6 @@ metadata: labels: app: etcd etcd: k8s - annotations: - prometheus.io/scrape: 'true' spec: type: ClusterIP clusterIP: None @@ -29,4 +27,4 @@ subsets: ports: - name: api port: 2379 - protocol: TCP \ No newline at end of file + protocol: TCP diff --git a/manifests/etcd/etcd-bootkube-vagrant-multi.yaml b/manifests/etcd/etcd-bootkube-vagrant-multi.yaml index 9f956922b2d2a0d1ddbbfe21e7699d4b63fb03c0..38cdc9c40f9db356121d28a20f7e25886f4cfc44 100644 --- a/manifests/etcd/etcd-bootkube-vagrant-multi.yaml +++ b/manifests/etcd/etcd-bootkube-vagrant-multi.yaml @@ -5,8 +5,6 @@ metadata: labels: app: etcd etcd: k8s - annotations: - prometheus.io/scrape: 'true' spec: type: ClusterIP clusterIP: None @@ -29,4 +27,4 @@ subsets: ports: - name: api port: 2379 - protocol: TCP \ No newline at end of file + protocol: TCP diff --git a/manifests/examples/example-app/example-app.yaml b/manifests/examples/example-app/example-app.yaml index 59a9b44dad3d75f5fc196e4e6f85abcc67437c10..adb6602b888f42446eb0cfe7760d944b5605417b 100644 --- a/manifests/examples/example-app/example-app.yaml +++ b/manifests/examples/example-app/example-app.yaml @@ -4,8 +4,6 @@ metadata: name: example-app labels: tier: frontend - annotations: - prometheus.io/scrape: 'true' spec: selector: app: example-app diff --git a/manifests/exporters/kube-state-metrics-svc.yaml b/manifests/exporters/kube-state-metrics-svc.yaml index 3b996b889f573c80b03d072524bd841da040426b..8b68484b072e09d05f15b5b6b7520a0860a69415 100644 --- a/manifests/exporters/kube-state-metrics-svc.yaml +++ b/manifests/exporters/kube-state-metrics-svc.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Service metadata: - annotations: - prometheus.io/scrape: 'true' labels: app: kube-state-metrics name: kube-state-metrics diff --git a/manifests/exporters/node-exporter-svc.yaml b/manifests/exporters/node-exporter-svc.yaml index e9286e2b2fa8327e4fd913b71347c652ac90fb49..f2d24a422375075f7d5ee3f5f6650ceb33f7d7b7 100644 --- a/manifests/exporters/node-exporter-svc.yaml +++ b/manifests/exporters/node-exporter-svc.yaml @@ -3,8 +3,6 @@ kind: Service metadata: labels: app: node-exporter - annotations: - prometheus.io/scrape: 'true' name: node-exporter spec: type: ClusterIP diff --git a/manifests/grafana/grafana-svc.yaml b/manifests/grafana/grafana-svc.yaml index 0fd4e87bbf015f81beca8389d963f2c82753f798..adb26233b195fbf3b3c6ee16640752ea06731920 100644 --- a/manifests/grafana/grafana-svc.yaml +++ b/manifests/grafana/grafana-svc.yaml @@ -4,8 +4,6 @@ metadata: name: grafana labels: app: grafana - annotations: - prometheus.io/scrape: 'true' spec: type: NodePort ports: @@ -14,4 +12,4 @@ spec: protocol: TCP nodePort: 30902 selector: - app: grafana \ No newline at end of file + app: grafana diff --git a/manifests/k8s/kube-controller-manager-bootkube-vagrant-multi.yaml b/manifests/k8s/kube-controller-manager-bootkube-vagrant-multi.yaml index 316076f394802778c2dd3001fd93769b92717f0b..2e6b4db956d030d0fe7459af1bbdb66f160ff2ad 100644 --- a/manifests/k8s/kube-controller-manager-bootkube-vagrant-multi.yaml +++ b/manifests/k8s/kube-controller-manager-bootkube-vagrant-multi.yaml @@ -4,8 +4,6 @@ metadata: name: kube-controller-manager-prometheus-discovery labels: k8s-app: kube-controller-manager - annotations: - prometheus.io/scrape: 'true' spec: selector: k8s-app: kube-controller-manager diff --git a/manifests/k8s/kube-scheduler-bootkube-vagrant-multi.yaml b/manifests/k8s/kube-scheduler-bootkube-vagrant-multi.yaml index 67360ec248b7e19a8d2908e928df329b3f011e4e..b79853d22f5233b028777e42fa9b808c47fc4939 100644 --- a/manifests/k8s/kube-scheduler-bootkube-vagrant-multi.yaml +++ b/manifests/k8s/kube-scheduler-bootkube-vagrant-multi.yaml @@ -4,8 +4,6 @@ metadata: name: kube-scheduler-prometheus-discovery labels: k8s-app: kube-scheduler - annotations: - prometheus.io/scrape: 'true' spec: selector: k8s-app: kube-scheduler