diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2019-02-08 07:31:03 +0000 |
| commit | 50485bedfd9818165aa1d039d0abe95a559134b7 (patch) | |
| tree | 79c7b08f67edcfb0c936e7a22931653b91189b9f /contrib/sles11/netdata-python-plugin-sles11.patch | |
| parent | Releasing debian version 1.11.1+dfsg-7. (diff) | |
| download | netdata-50485bedfd9818165aa1d039d0abe95a559134b7.tar.xz netdata-50485bedfd9818165aa1d039d0abe95a559134b7.zip | |
Merging upstream version 1.12.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'contrib/sles11/netdata-python-plugin-sles11.patch')
| -rw-r--r-- | contrib/sles11/netdata-python-plugin-sles11.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/contrib/sles11/netdata-python-plugin-sles11.patch b/contrib/sles11/netdata-python-plugin-sles11.patch new file mode 100644 index 000000000..d2e8f6b69 --- /dev/null +++ b/contrib/sles11/netdata-python-plugin-sles11.patch @@ -0,0 +1,28 @@ +diff -u netdata-1.10.0.orig/plugins.d/python.d.plugin netdata-1.10.0/plugins.d/python.d.plugin +--- netdata-1.10.0.orig/plugins.d/python.d.plugin 2018-05-08 20:01:40.000000000 +0300 ++++ netdata-1.10.0/plugins.d/python.d.plugin 2018-05-08 20:06:57.000000000 +0300 +@@ -15,10 +15,8 @@ + from sys import version_info, argv + from time import sleep + +-try: +- from time import monotonic as time +-except ImportError: +- from time import time ++# from time import monotonic as time ++from time import time + + PY_VERSION = version_info[:2] + PLUGIN_CONFIG_DIR = os.getenv('NETDATA_CONFIG_DIR', os.path.dirname(__file__) + '/../../../../etc/netdata') + '/' +@@ -32,10 +30,7 @@ + from bases.loggers import PythonDLogger + from bases.collection import setdefault_values, run_and_exit + +-try: +- from collections import OrderedDict +-except ImportError: +- from third_party.ordereddict import OrderedDict ++from ordereddict import OrderedDict + + BASE_CONFIG = {'update_every': os.getenv('NETDATA_UPDATE_EVERY', 1), + 'retries': 60, |