easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

manifests: remove prometheus.io/scrape annotations

Browse Source 
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.
This commit is contained in:
Frederic Branczyk
2016-12-02 13:51:45 +01:00
parent 20f88eed10
commit 0c1bb5c1c9
9 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -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)

2
manifests/etcd/etcd-bootkube-gce.yaml
View File

@@ -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

2
manifests/etcd/etcd-bootkube-vagrant-multi.yaml
View File

@@ -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

2
manifests/examples/example-app/example-app.yaml
View File

@@ -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

2
manifests/exporters/kube-state-metrics-svc.yaml
View File

@@ -1,8 +1,6 @@
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

2
manifests/exporters/node-exporter-svc.yaml
View File

@@ -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

2
manifests/grafana/grafana-svc.yaml
View File

@@ -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:

2
manifests/k8s/kube-controller-manager-bootkube-vagrant-multi.yaml
View File

@@ -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

2
manifests/k8s/kube-scheduler-bootkube-vagrant-multi.yaml
View File

@@ -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