From bfcf212c2c6286d6f11fce06a16aa546c4f47c41 Mon Sep 17 00:00:00 2001 From: nicolargo Date: Wed, 3 Jul 2019 22:25:33 +0200 Subject: Prometheus integration broken with latest prometheus_client #1397 --- NEWS | 1 + conf/glances.conf | 2 +- glances/exports/glances_prometheus.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index 834a1a70..16acebc2 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,7 @@ Bugs corrected: * Getting an error when running with prometheus exporter #1469 * Stack trace when starts Glances on CentOS #1470 * UnicodeEncodeError: 'ascii' codec can't encode character u'\u25cf' - Raspbian stretch #1483 + * Prometheus integration broken with latest prometheus_client #1397 Others: diff --git a/conf/glances.conf b/conf/glances.conf index 0f2cff82..1e985bf7 100644 --- a/conf/glances.conf +++ b/conf/glances.conf @@ -469,7 +469,7 @@ prefix=G host=localhost port=9091 #prefix=glances -labels=system:`uname -s` +labels=src:glances [restful] # Configuration for the --export RESTful option diff --git a/glances/exports/glances_prometheus.py b/glances/exports/glances_prometheus.py index eb15768c..31667f9e 100644 --- a/glances/exports/glances_prometheus.py +++ b/glances/exports/glances_prometheus.py @@ -41,8 +41,8 @@ class Export(GlancesExport): # Load the Prometheus configuration file section self.export_enable = self.load_conf('prometheus', - mandatories=['host', 'port'], - options=['prefix', 'labels']) + mandatories=['host', 'port', 'labels'], + options=['prefix']) if not self.export_enable: sys.exit(2) -- cgit v1.2.3