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:10:12 UTC
[skywalking] branch prometheus_host_port created (now 926cf78)
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a change to branch prometheus_host_port
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
at 926cf78 add prometheus.
This branch includes the following new commits:
new 926cf78 add prometheus.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: add prometheus.
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tanjian pushed a commit to branch prometheus_host_port
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 926cf7870fe667614ce2b0a2d1aacde4334dd1cb
Author: Jared.Tan <ji...@daocloud.io>
AuthorDate: Sun May 5 15:09:27 2019 +0800
add prometheus.
---
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}