1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
From: Lennart Weller <lhw@ring0.de>
Date: Wed, 4 Apr 2018 14:22:34 +0200
Subject: python libraries removed from make. remove unused contrib files
---
python.d/Makefile.am | 42 --------------------------------
python.d/python_modules/bases/loaders.py | 4 +--
web/Makefile.am | 32 ------------------------
3 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/python.d/Makefile.am b/python.d/Makefile.am
index a5fcc73..29d8c45 100644
--- a/python.d/Makefile.am
+++ b/python.d/Makefile.am
@@ -97,48 +97,6 @@ dist_third_party_DATA = \
python_modules/third_party/lm_sensors.py \
$(NULL)
-pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
-dist_pythonyaml2_DATA = \
- python_modules/pyyaml2/__init__.py \
- python_modules/pyyaml2/composer.py \
- python_modules/pyyaml2/constructor.py \
- python_modules/pyyaml2/cyaml.py \
- python_modules/pyyaml2/dumper.py \
- python_modules/pyyaml2/emitter.py \
- python_modules/pyyaml2/error.py \
- python_modules/pyyaml2/events.py \
- python_modules/pyyaml2/loader.py \
- python_modules/pyyaml2/nodes.py \
- python_modules/pyyaml2/parser.py \
- python_modules/pyyaml2/reader.py \
- python_modules/pyyaml2/representer.py \
- python_modules/pyyaml2/resolver.py \
- python_modules/pyyaml2/scanner.py \
- python_modules/pyyaml2/serializer.py \
- python_modules/pyyaml2/tokens.py \
- $(NULL)
-
-pythonyaml3dir=$(pythonmodulesdir)/pyyaml3
-dist_pythonyaml3_DATA = \
- python_modules/pyyaml3/__init__.py \
- python_modules/pyyaml3/composer.py \
- python_modules/pyyaml3/constructor.py \
- python_modules/pyyaml3/cyaml.py \
- python_modules/pyyaml3/dumper.py \
- python_modules/pyyaml3/emitter.py \
- python_modules/pyyaml3/error.py \
- python_modules/pyyaml3/events.py \
- python_modules/pyyaml3/loader.py \
- python_modules/pyyaml3/nodes.py \
- python_modules/pyyaml3/parser.py \
- python_modules/pyyaml3/reader.py \
- python_modules/pyyaml3/representer.py \
- python_modules/pyyaml3/resolver.py \
- python_modules/pyyaml3/scanner.py \
- python_modules/pyyaml3/serializer.py \
- python_modules/pyyaml3/tokens.py \
- $(NULL)
-
python_urllib3dir=$(pythonmodulesdir)/urllib3
dist_python_urllib3_DATA = \
python_modules/urllib3/__init__.py \
diff --git a/python.d/python_modules/bases/loaders.py b/python.d/python_modules/bases/loaders.py
index d18b9dc..71ba221 100644
--- a/python.d/python_modules/bases/loaders.py
+++ b/python.d/python_modules/bases/loaders.py
@@ -8,11 +8,11 @@ from sys import version_info
PY_VERSION = version_info[:2]
if PY_VERSION > (3, 1):
- from pyyaml3 import SafeLoader as YamlSafeLoader
+ from yaml import SafeLoader as YamlSafeLoader
from importlib.machinery import SourceFileLoader
DEFAULT_MAPPING_TAG = 'tag:yaml.org,2002:map'
else:
- from pyyaml2 import SafeLoader as YamlSafeLoader
+ from yaml import SafeLoader as YamlSafeLoader
from imp import load_source as SourceFileLoader
DEFAULT_MAPPING_TAG = u'tag:yaml.org,2002:map'
diff --git a/web/Makefile.am b/web/Makefile.am
index ac92287..57595fc 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -4,10 +4,6 @@
MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
dist_web_DATA = \
- demo.html \
- demo2.html \
- demosites.html \
- demosites2.html \
dashboard.html \
dashboard.js \
dashboard_info.js \
@@ -28,15 +24,6 @@ dist_web_DATA = \
version.txt \
$(NULL)
-webolddir=$(webdir)/old
-dist_webold_DATA = \
- old/datasource.html \
- old/index.html \
- old/index.js \
- old/netdata.js \
- old/theme.css \
- $(NULL)
-
weblibdir=$(webdir)/lib
dist_weblib_DATA = \
lib/bootstrap-3.3.7.min.js \
@@ -75,15 +62,6 @@ dist_webcss_DATA = \
css/c3-0.4.18.min.css \
$(NULL)
-webfontsdir=$(webdir)/fonts
-dist_webfonts_DATA = \
- fonts/glyphicons-halflings-regular.eot \
- fonts/glyphicons-halflings-regular.svg \
- fonts/glyphicons-halflings-regular.ttf \
- fonts/glyphicons-halflings-regular.woff \
- fonts/glyphicons-halflings-regular.woff2 \
- $(NULL)
-
webimagesdir=$(webdir)/images
dist_webimages_DATA = \
images/alert-128-orange.png \
@@ -108,16 +86,6 @@ dist_webimages_DATA = \
images/seo-performance-multi-size.icns \
$(NULL)
-
-webwellknowndir=$(webdir)/.well-known
-dist_webwellknown_DATA = \
- $(NULL)
-
-webdntdir=$(webdir)/.well-known/dnt
-dist_webdnt_DATA = \
- .well-known/dnt/cookies \
- $(NULL)
-
version.txt:
if test -d "$(top_srcdir)/.git"; then \
git --git-dir="$(top_srcdir)/.git" log -n 1 --format=%H; \
|
