Merge branch 'master' of https://github.com/coreos/prometheus-operator

2017-09-09 12:03:36 +02:00
parent b75d263567 88fe225e81
commit 7067e8d6d1
40 changed files with 11968 additions and 6707 deletions
--- a/manifests/grafana/grafana-dashboards.yaml
+++ b/manifests/grafana/grafana-dashboards.yaml
--- a/manifests/grafana/grafana-deployment.yaml
+++ b/manifests/grafana/grafana-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1beta1
 kind: Deployment
 metadata:
  name: grafana
@@ -41,7 +41,7 @@ spec:
            memory: 200Mi
            cpu: 200m
      - name: grafana-watcher
-        image: quay.io/coreos/grafana-watcher:v0.0.7
+        image: quay.io/coreos/grafana-watcher:v0.0.8
        args:
          - '--watch-dir=/var/grafana-dashboards'
          - '--grafana-url=http://localhost:3000'
--- a/manifests/grafana/grafana-service.yaml
+++ b/manifests/grafana/grafana-service.yaml
@@ -7,9 +7,9 @@ metadata:
 spec:
  type: NodePort
  ports:
-  - name: web
-    port: 3000
+  - port: 3000
    protocol: TCP
    nodePort: 30902
+    targetPort: web
  selector:
    app: grafana