This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 2710586 Fix Prometheus metrics provider package name (#1868)
2710586 is described below
commit 2710586b7bb05ccf0141f42f0db55031ef99347f
Author: Matteo Merli <[email protected]>
AuthorDate: Wed May 30 13:01:26 2018 -0700
Fix Prometheus metrics provider package name (#1868)
---
deployment/dcos/PulsarGroups.json | 3 +--
deployment/kubernetes/aws/bookkeeper.yaml | 2 +-
deployment/kubernetes/generic/bookie.yaml | 2 +-
deployment/kubernetes/google-kubernetes-engine/bookie.yaml | 4 ++--
deployment/terraform-ansible/templates/bookkeeper.conf | 2 +-
site/_data/config/bookkeeper.yaml | 2 +-
6 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/deployment/dcos/PulsarGroups.json
b/deployment/dcos/PulsarGroups.json
index 990ec57..4b43967 100644
--- a/deployment/dcos/PulsarGroups.json
+++ b/deployment/dcos/PulsarGroups.json
@@ -86,7 +86,7 @@
"// Notice": "add PULSAR_MEM, PULSAR_GC, according to your
environment.",
"zkServers": "master.mesos:2181",
"ledgerManagerType": "hierarchical",
- "statsProviderClass":
"org.apache.bookkeeper.stats.PrometheusMetricsProvider",
+ "statsProviderClass":
"org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider",
"journalDirectory": "/bookkeeper/data/journal",
"ledgerDirectories": "/bookkeeper/data/ledgers",
"indexDirectories": "/bookkeeper/data/index"
@@ -348,4 +348,3 @@
}
]
}
-
diff --git a/deployment/kubernetes/aws/bookkeeper.yaml
b/deployment/kubernetes/aws/bookkeeper.yaml
index 9f1418c..426afcf 100644
--- a/deployment/kubernetes/aws/bookkeeper.yaml
+++ b/deployment/kubernetes/aws/bookkeeper.yaml
@@ -60,7 +60,7 @@ data:
dbStorage_rocksDB_blockCacheSize: "4294967296"
journalMaxSizeMB: "2048"
zkServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
- statsProviderClass: org.apache.bookkeeper.stats.PrometheusMetricsProvider
+ statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
useHostNameAsBookieID: "true"
---
apiVersion: apps/v1beta1
diff --git a/deployment/kubernetes/generic/bookie.yaml
b/deployment/kubernetes/generic/bookie.yaml
index d297db0..7955097 100644
--- a/deployment/kubernetes/generic/bookie.yaml
+++ b/deployment/kubernetes/generic/bookie.yaml
@@ -27,7 +27,7 @@ data:
dbStorage_writeCacheMaxSizeMb: "256" # Write cache size (direct memory)
dbStorage_readAheadCacheMaxSizeMb: "256" # Read cache size (direct memory)
zkServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
- statsProviderClass: org.apache.bookkeeper.stats.PrometheusMetricsProvider
+ statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
---
## BookKeeper servers need to access the local disks and the pods
diff --git a/deployment/kubernetes/google-kubernetes-engine/bookie.yaml
b/deployment/kubernetes/google-kubernetes-engine/bookie.yaml
index 97800ed..e5caf7c 100644
--- a/deployment/kubernetes/google-kubernetes-engine/bookie.yaml
+++ b/deployment/kubernetes/google-kubernetes-engine/bookie.yaml
@@ -49,7 +49,7 @@ data:
dbStorage_writeCacheMaxSizeMb: "1024"
dbStorage_readAheadCacheMaxSizeMb: "1024"
zkServers: zk-0.zookeeper,zk-1.zookeeper,zk-2.zookeeper
- statsProviderClass: org.apache.bookkeeper.stats.PrometheusMetricsProvider
+ statsProviderClass:
org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
useHostNameAsBookieID: "true"
---
apiVersion: apps/v1beta1
@@ -109,7 +109,7 @@ spec:
hostPort: 3181
name: client
envFrom:
- - configMapRef:
+ - configMapRef:
name: bookie-config
volumeMounts:
- name: journal-disk
diff --git a/deployment/terraform-ansible/templates/bookkeeper.conf
b/deployment/terraform-ansible/templates/bookkeeper.conf
index a3ede93..7e97989 100644
--- a/deployment/terraform-ansible/templates/bookkeeper.conf
+++ b/deployment/terraform-ansible/templates/bookkeeper.conf
@@ -317,7 +317,7 @@ writeBufferSizeBytes=65536
useHostNameAsBookieID=false
# Stats Provider Class
-statsProviderClass=org.apache.bookkeeper.stats.PrometheusMetricsProvider
+statsProviderClass=org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
# Default port for Prometheus metrics exporter
prometheusStatsHttpPort=8000
diff --git a/site/_data/config/bookkeeper.yaml
b/site/_data/config/bookkeeper.yaml
index 8f9631a..7ce8eee 100644
--- a/site/_data/config/bookkeeper.yaml
+++ b/site/_data/config/bookkeeper.yaml
@@ -198,7 +198,7 @@ configs:
description: |
Whether the bookie should use its hostname to register with the
coordination service (e.g.: zookeeper service). When `false`, bookie will use
its ipaddress for the registration.
- name: statsProviderClass
- default: org.apache.bookkeeper.stats.PrometheusMetricsProvider
+ default: org.apache.bookkeeper.stats.prometheus.PrometheusMetricsProvider
- name: prometheusStatsHttpPort
default: 8000
- name: dbStorage_writeCacheMaxSizeMb
--
To stop receiving notification emails like this one, please contact
[email protected].