From cbe5fc1d4f6b1ff604acb816f885cbafd21c97f6 Mon Sep 17 00:00:00 2001
From: capossele <angelocapossele@gmail.com>
Date: Wed, 10 Jun 2020 09:40:21 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=88=20Update=20Prometheus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
plugins/prometheus/metrics.go | 4 ++--
plugins/prometheus/parameters.go | 2 +-
tools/docker-network/docker-compose.yml | 15 ++++++++++++++-
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/plugins/prometheus/metrics.go b/plugins/prometheus/metrics.go
index efeb6593..799379c4 100644
--- a/plugins/prometheus/metrics.go
+++ b/plugins/prometheus/metrics.go
@@ -17,9 +17,9 @@ func init() {
registry.MustRegister(messagesPerSecond)
- addCollect(collectServer)
+ addCollect(collectMetrics)
}
-func collectServer() {
+func collectMetrics() {
messagesPerSecond.Set(float64(metrics.ReceivedMessagesPerSecond()))
}
diff --git a/plugins/prometheus/parameters.go b/plugins/prometheus/parameters.go
index edfffadd..dbc77cb0 100644
--- a/plugins/prometheus/parameters.go
+++ b/plugins/prometheus/parameters.go
@@ -16,7 +16,7 @@ const (
)
func init() {
- flag.String(CfgPrometheusBindAddress, "localhost:9311", "the bind address on which the Prometheus exporter listens on")
+ flag.String(CfgPrometheusBindAddress, "0.0.0.0:9311", "the bind address on which the Prometheus exporter listens on")
flag.Bool(CfgPrometheusGoMetrics, false, "include go metrics")
flag.Bool(CfgPrometheusProcessMetrics, false, "include process metrics")
flag.Bool(CfgPrometheusPromhttpMetrics, false, "include promhttp metrics")
diff --git a/tools/docker-network/docker-compose.yml b/tools/docker-network/docker-compose.yml
index a81aed5b..76bf14c1 100644
--- a/tools/docker-network/docker-compose.yml
+++ b/tools/docker-network/docker-compose.yml
@@ -40,14 +40,15 @@ services:
command: >
--config-dir=/tmp
--database.directory=/tmp/mainnetdb
- --node.enablePlugins=bootstrap
--node.disablePlugins=valuetransfers
+ --node.enablePlugins=bootstrap,prometheus
volumes:
- ./config.docker.json:/tmp/config.json:ro
- goshimmer-cache:/go
ports:
- "127.0.0.1:8080:8080/tcp" # web API
- "127.0.0.1:8081:8081/tcp" # dashboard
+ - "127.0.0.1:9311:9311/tcp" # prometheus
depends_on:
- entry_node
@@ -67,6 +68,18 @@ services:
depends_on:
- entry_node
+ prometheus:
+ image: prom/prometheus:latest
+ container_name: prometheus
+ ports:
+ - 9090:9090
+ command:
+ - --config.file=/etc/prometheus/prometheus.yml
+ volumes:
+ - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+ depends_on:
+ - peer_master
+
volumes:
goshimmer-cache:
name: goshimmer-cache
--
GitLab