Merge pull request #3111 from hchenxa/hchenxa_monitor

doc issue related to monitor part
kubernetes · Sep 20, 2018 · 37b2109 · 37b2109
2 parents 42912df + be87141
commit 37b2109
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/deploy/monitoring/configuration.yaml b/deploy/monitoring/configuration.yaml
@@ -38,5 +38,5 @@ data:
         replacement: $1:$2
 
       - source_labels: [__meta_kubernetes_service_name]
-        regex: prometheus-service
+        regex: prometheus-server
         action: drop
diff --git a/deploy/monitoring/prometheus.yaml b/deploy/monitoring/prometheus.yaml
@@ -94,7 +94,7 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: prometheus-service
+  name: prometheus-server
   namespace: ingress-nginx
   labels:
     app.kubernetes.io/name: prometheus

diff --git a/docs/user-guide/monitoring.md b/docs/user-guide/monitoring.md
@@ -32,7 +32,7 @@ clusterrole "prometheus-server" created
 serviceaccount "prometheus-server" created
 clusterrolebinding "prometheus-server" created
 deployment "prometheus-server" created
-service "prometheus-service" created
+service "prometheus-server" created
 ```
 
 ### Prometheus Dashboard
@@ -44,7 +44,7 @@ kubectl get svc -n ingress-nginx
 NAME                   TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)                                      AGE
 default-http-backend   ClusterIP   10.103.59.201   <none>        80/TCP                                       3d
 ingress-nginx          NodePort    10.97.44.72     <none>        80:30100/TCP,443:30154/TCP,10254:32049/TCP   5h
-prometheus             NodePort    10.98.233.86    <none>        9090:32630/TCP                               1m
+prometheus-server      NodePort    10.98.233.86    <none>        9090:32630/TCP                               1m
 ```
 
 Obtain the IP address of the nodes in the running cluster:
@@ -77,8 +77,8 @@ kubectl get svc -n ingress-nginx
 NAME                   TYPE        CLUSTER-IP      EXTERNAL-IP   PORT(S)                                      AGE
 default-http-backend   ClusterIP   10.103.59.201   <none>        80/TCP                                       3d
 ingress-nginx          NodePort    10.97.44.72     <none>        80:30100/TCP,443:30154/TCP,10254:32049/TCP   5h
-prometheus             NodePort    10.98.233.86    <none>        9090:32630/TCP                               10m
-grafana                NodePort    10.98.233.86    <none>        9090:31086/TCP                               10m
+prometheus-server      NodePort    10.98.233.86    <none>        9090:32630/TCP                               10m
+grafana                NodePort    10.98.233.87    <none>        3000:31086/TCP                               10m
 ```
 
 Open your browser and visit the following URL: _http://{node IP address}:{grafana-svc-nodeport}_ to load the Grafana Dashboard.