You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ta...@apache.org on 2019/05/05 07:52:47 UTC
[skywalking] branch master updated: add prometheus. (#2580)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 4da0f48 add prometheus. (#2580)
4da0f48 is described below
commit 4da0f486b5fec3d31ae59f58e4bb66528477077d
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Sun May 5 15:52:40 2019 +0800
add prometheus. (#2580)
---
oap-server/server-starter/src/main/assembly/application.yml | 4 ++++
oap-server/server-starter/src/main/resources/application.yml | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index 1f7a8cf..49fa699 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -114,3 +114,7 @@ alarm:
default:
telemetry:
none:
+#exporter:
+# grpc:
+# targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1}
+# targetPort: ${SW_EXPORTER_GRPC_PORT:9870}
diff --git a/oap-server/server-starter/src/main/resources/application.yml b/oap-server/server-starter/src/main/resources/application.yml
index 4c6d232..796d17c 100644
--- a/oap-server/server-starter/src/main/resources/application.yml
+++ b/oap-server/server-starter/src/main/resources/application.yml
@@ -118,7 +118,9 @@ alarm:
default:
telemetry:
prometheus:
+ host: ${SW_TELEMETRY_PROMETHEUS_HOST:0.0.0.0}
+ port: ${SW_TELEMETRY_PROMETHEUS_PORT:1234}
#exporter:
# grpc:
-# targetHost: 127.0.0.1
-# targetPort: 9870
+# targetHost: ${SW_EXPORTER_GRPC_HOST:127.0.0.1}
+# targetPort: ${SW_EXPORTER_GRPC_PORT:9870}