diff options
author | nicolargo <nicolas@nicolargo.com> | 2024-03-30 18:24:31 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2024-03-30 18:24:31 +0100 |
commit | 24a3aead9d8caca7ed83d40478b12d6818049682 (patch) | |
tree | 7b68a6ac86aabcdd1a53380da09b9704156616e0 | |
parent | ae596610ff02fe3e529955c4d6bea47798e51241 (diff) |
Rename export folder to avoid error of the dep lib use inside an export plugin has the same name: for example csv, use the python lib csv...
-rw-r--r-- | glances/exports/export.py | 2 | ||||
-rw-r--r-- | glances/exports/glances_cassandra/__init__.py (renamed from glances/exports/cassandra/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_couchdb/__init__.py (renamed from glances/exports/couchdb/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_csv/__init__.py (renamed from glances/exports/csv/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_elasticsearch/__init__.py (renamed from glances/exports/elasticsearch/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_graph/__init__.py (renamed from glances/exports/graph/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_graphite/__init__.py (renamed from glances/exports/graphite/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_influxdb2/__init__.py (renamed from glances/exports/influxdb2/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_json/__init__.py (renamed from glances/exports/json/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_kafka/__init__.py (renamed from glances/exports/kafka/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_mongodb/__init__.py (renamed from glances/exports/mongodb/__init__.py) | 0 | ||||
-rwxr-xr-x | glances/exports/glances_mqtt/__init__.py (renamed from glances/exports/mqtt/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_opentsdb/__init__.py (renamed from glances/exports/opentsdb/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_prometheus/__init__.py (renamed from glances/exports/prometheus/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_rabbitmq/__init__.py (renamed from glances/exports/rabbitmq/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_restful/__init__.py (renamed from glances/exports/restful/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_riemann/__init__.py (renamed from glances/exports/riemann/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_statsd/__init__.py (renamed from glances/exports/statsd/__init__.py) | 0 | ||||
-rw-r--r-- | glances/exports/glances_zeromq/__init__.py (renamed from glances/exports/zeromq/__init__.py) | 0 | ||||
-rw-r--r-- | glances/standalone.py | 12 |
20 files changed, 7 insertions, 7 deletions
diff --git a/glances/exports/export.py b/glances/exports/export.py index 45a08c77..dbcabe62 100644 --- a/glances/exports/export.py +++ b/glances/exports/export.py @@ -41,7 +41,7 @@ class GlancesExport(object): def __init__(self, config=None, args=None): """Init the export class.""" - # Export name (= module name without glances_) + # Export name self.export_name = self.__class__.__module__ logger.debug("Init export module %s" % self.export_name) diff --git a/glances/exports/cassandra/__init__.py b/glances/exports/glances_cassandra/__init__.py index aa88eb13..aa88eb13 100644 --- a/glances/exports/cassandra/__init__.py +++ b/glances/exports/glances_cassandra/__init__.py diff --git a/glances/exports/couchdb/__init__.py b/glances/exports/glances_couchdb/__init__.py index 5cc65529..5cc65529 100644 --- a/glances/exports/couchdb/__init__.py +++ b/glances/exports/glances_couchdb/__init__.py diff --git a/glances/exports/csv/__init__.py b/glances/exports/glances_csv/__init__.py index 88e0615a..88e0615a 100644 --- a/glances/exports/csv/__init__.py +++ b/glances/exports/glances_csv/__init__.py diff --git a/glances/exports/elasticsearch/__init__.py b/glances/exports/glances_elasticsearch/__init__.py index 83e5dc98..83e5dc98 100644 --- a/glances/exports/elasticsearch/__init__.py +++ b/glances/exports/glances_elasticsearch/__init__.py diff --git a/glances/exports/graph/__init__.py b/glances/exports/glances_graph/__init__.py index 24d4a98a..24d4a98a 100644 --- a/glances/exports/graph/__init__.py +++ b/glances/exports/glances_graph/__init__.py diff --git a/glances/exports/graphite/__init__.py b/glances/exports/glances_graphite/__init__.py index 19c42da8..19c42da8 100644 --- a/glances/exports/graphite/__init__.py +++ b/glances/exports/glances_graphite/__init__.py diff --git a/glances/exports/influxdb2/__init__.py b/glances/exports/glances_influxdb2/__init__.py index 1c33da73..1c33da73 100644 --- a/glances/exports/influxdb2/__init__.py +++ b/glances/exports/glances_influxdb2/__init__.py diff --git a/glances/exports/json/__init__.py b/glances/exports/glances_json/__init__.py index b637d613..b637d613 100644 --- a/glances/exports/json/__init__.py +++ b/glances/exports/glances_json/__init__.py diff --git a/glances/exports/kafka/__init__.py b/glances/exports/glances_kafka/__init__.py index 6d365fc4..6d365fc4 100644 --- a/glances/exports/kafka/__init__.py +++ b/glances/exports/glances_kafka/__init__.py diff --git a/glances/exports/mongodb/__init__.py b/glances/exports/glances_mongodb/__init__.py index 427a4c97..427a4c97 100644 --- a/glances/exports/mongodb/__init__.py +++ b/glances/exports/glances_mongodb/__init__.py diff --git a/glances/exports/mqtt/__init__.py b/glances/exports/glances_mqtt/__init__.py index 94279749..94279749 100755 --- a/glances/exports/mqtt/__init__.py +++ b/glances/exports/glances_mqtt/__init__.py diff --git a/glances/exports/opentsdb/__init__.py b/glances/exports/glances_opentsdb/__init__.py index 1f864a80..1f864a80 100644 --- a/glances/exports/opentsdb/__init__.py +++ b/glances/exports/glances_opentsdb/__init__.py diff --git a/glances/exports/prometheus/__init__.py b/glances/exports/glances_prometheus/__init__.py index 919aeabb..919aeabb 100644 --- a/glances/exports/prometheus/__init__.py +++ b/glances/exports/glances_prometheus/__init__.py diff --git a/glances/exports/rabbitmq/__init__.py b/glances/exports/glances_rabbitmq/__init__.py index 04ab8307..04ab8307 100644 --- a/glances/exports/rabbitmq/__init__.py +++ b/glances/exports/glances_rabbitmq/__init__.py diff --git a/glances/exports/restful/__init__.py b/glances/exports/glances_restful/__init__.py index b3b23461..b3b23461 100644 --- a/glances/exports/restful/__init__.py +++ b/glances/exports/glances_restful/__init__.py diff --git a/glances/exports/riemann/__init__.py b/glances/exports/glances_riemann/__init__.py index 78c39eca..78c39eca 100644 --- a/glances/exports/riemann/__init__.py +++ b/glances/exports/glances_riemann/__init__.py diff --git a/glances/exports/statsd/__init__.py b/glances/exports/glances_statsd/__init__.py index 57620a0c..57620a0c 100644 --- a/glances/exports/statsd/__init__.py +++ b/glances/exports/glances_statsd/__init__.py diff --git a/glances/exports/zeromq/__init__.py b/glances/exports/glances_zeromq/__init__.py index 18b229d8..18b229d8 100644 --- a/glances/exports/zeromq/__init__.py +++ b/glances/exports/glances_zeromq/__init__.py diff --git a/glances/standalone.py b/glances/standalone.py index c90b927c..197ab7c4 100644 --- a/glances/standalone.py +++ b/glances/standalone.py @@ -142,12 +142,6 @@ class GlancesStandalone(object): self.stats.update() logger.debug('Stats updated duration: {} seconds'.format(counter.get())) - # Export stats - # Start a counter used to compute the time needed - counter_export = Counter() - self.stats.export(self.stats) - logger.debug('Stats exported duration: {} seconds'.format(counter_export.get())) - # Patch for issue1326 to avoid < 0 refresh adapted_refresh = self.refresh_time - counter.get() adapted_refresh = adapted_refresh if adapted_refresh > 0 else 0 @@ -164,6 +158,12 @@ class GlancesStandalone(object): time.sleep(adapted_refresh) ret = True + # Export stats + # Start a counter used to compute the time needed + counter_export = Counter() + self.stats.export(self.stats) + logger.debug('Stats exported duration: {} seconds'.format(counter_export.get())) + return ret def serve_n(self, n=1): |