You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by GitBox <gi...@apache.org> on 2017/12/07 08:06:47 UTC
[GitHub] merlimat closed pull request #948: Fix some typos under k8s dir
merlimat closed pull request #948: Fix some typos under k8s dir
URL: https://github.com/apache/incubator-pulsar/pull/948
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/kubernetes/generic/broker.yaml b/kubernetes/generic/broker.yaml
index b56634fb8..452cdf119 100644
--- a/kubernetes/generic/broker.yaml
+++ b/kubernetes/generic/broker.yaml
@@ -73,7 +73,7 @@ spec:
---
##
-## Define the Bookie headless service
+## Define the Broker headless service
## In practice, in this case, it is only useful to have a view of
## all the broker pods that are present
##
diff --git a/kubernetes/generic/monitoring.yaml b/kubernetes/generic/monitoring.yaml
index 090105c51..2873203d0 100644
--- a/kubernetes/generic/monitoring.yaml
+++ b/kubernetes/generic/monitoring.yaml
@@ -23,7 +23,7 @@ metadata:
name: prometheus-config
data:
# Include prometheus configuration file, setup to monitor all the
- # Kubernetes pods the the "scrape=true" annotation.
+ # Kubernetes pods with the "scrape=true" annotation.
prometheus.yml: |
global:
scrape_interval: 15s
@@ -129,7 +129,7 @@ spec:
- name: grafana
image: apachepulsar/pulsar-grafana:latest
ports:
- - containerPort: 9090
+ - containerPort: 3000
env:
- name: PROMETHEUS_URL
value: http://prometheus:9090/
diff --git a/kubernetes/google-container-engine/broker.yaml b/kubernetes/google-container-engine/broker.yaml
index 74b019470..66f2468b8 100644
--- a/kubernetes/google-container-engine/broker.yaml
+++ b/kubernetes/google-container-engine/broker.yaml
@@ -72,7 +72,7 @@ spec:
---
##
-## Define the Bookie headless service
+## Define the Broker headless service
## In practice, in this case, it is only useful to have a view of
## all the broker pods that are present
##
diff --git a/kubernetes/google-container-engine/monitoring.yaml b/kubernetes/google-container-engine/monitoring.yaml
index 72625f440..e42105588 100644
--- a/kubernetes/google-container-engine/monitoring.yaml
+++ b/kubernetes/google-container-engine/monitoring.yaml
@@ -23,7 +23,7 @@ metadata:
name: prometheus-config
data:
# Include prometheus configuration file, setup to monitor all the
- # Kubernetes pods the the "scrape=true" annotation.
+ # Kubernetes pods with the "scrape=true" annotation.
prometheus.yml: |
global:
scrape_interval: 15s
@@ -147,7 +147,7 @@ spec:
- name: grafana
image: apachepulsar/pulsar-grafana:latest
ports:
- - containerPort: 9090
+ - containerPort: 3000
env:
- name: PROMETHEUS_URL
value: http://prometheus:9090/
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services