summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am27
-rw-r--r--configure.ac3
-rw-r--r--diagrams/Makefile.am13
-rw-r--r--makeself/Makefile.am25
-rwxr-xr-xnetdata-installer.sh12
-rw-r--r--tests/Makefile.am8
-rw-r--r--web/dashboard.css1
-rw-r--r--web/dashboard.js4
-rw-r--r--web/dashboard.slate.css1
-rw-r--r--web/dashboard_info.js77
-rw-r--r--web/index.html4
12 files changed, 148 insertions, 29 deletions
diff --git a/.gitignore b/.gitignore
index f8c55f3590..fc1e6ce5fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,3 +107,5 @@ diagrams/*.atxt
diagrams/plantuml.jar
netdata.cppcheck
+
+profile/statsd-stress
diff --git a/Makefile.am b/Makefile.am
index 7d5bc57f8e..6f04cd8c90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ MAINTAINERCLEANFILES= \
EXTRA_DIST = \
.gitignore \
+ .codacy.yml \
.codeclimate.yml \
.csslintrc \
.eslintignore \
@@ -42,7 +43,6 @@ EXTRA_DIST = \
LICENSE-REDISTRIBUTED.md \
COPYING \
autogen.sh \
- tests/stress.sh \
$(NULL)
SUBDIRS = \
@@ -55,14 +55,10 @@ SUBDIRS = \
system \
web \
contrib \
+ tests \
$(NULL)
dist_noinst_DATA= \
- diagrams/config.puml \
- diagrams/registry.puml \
- diagrams/netdata-for-ephemeral-nodes.xml \
- diagrams/netdata-proxies-example.xml \
- diagrams/netdata-overview.xml \
configs.signatures \
Dockerfile \
netdata.spec \
@@ -71,29 +67,10 @@ dist_noinst_DATA= \
# until integrated within build
# should be proper init.d/openrc/systemd usable
dist_noinst_SCRIPTS= \
- diagrams/build.sh \
coverity-scan.sh \
docker-build.sh \
kickstart.sh \
kickstart-static64.sh \
netdata-installer.sh \
installer/functions.sh \
- makeself/build.sh \
- makeself/makeself.sh \
- makeself/makeself-license.txt \
- makeself/setup-x86_64-static.sh \
- makeself/post-installer.sh \
- makeself/jobs/10-prepare-destination.install.sh \
- makeself/jobs/50-curl-7.53.1.install.sh \
- makeself/jobs/50-bash-4.4.install.sh \
- makeself/jobs/50-fping-4.0.install.sh \
- makeself/jobs/70-netdata-git.install.sh \
- makeself/jobs/99-makeself.install.sh \
- makeself/run-all-jobs.sh \
- makeself/install-or-update.sh \
- makeself/build-x86_64-static.sh \
- makeself/makeself-header.sh \
- makeself/makeself-help-header.txt \
- makeself/makeself.lsm \
- makeself/functions.sh \
$(NULL)
diff --git a/configure.ac b/configure.ac
index a0062d3ff0..ce534e0ace 100644
--- a/configure.ac
+++ b/configure.ac
@@ -492,7 +492,10 @@ AC_CONFIG_FILES([
src/Makefile
system/Makefile
web/Makefile
+ diagrams/Makefile
+ makeself/Makefile
contrib/Makefile
+ tests/Makefile
])
AC_OUTPUT
diff --git a/diagrams/Makefile.am b/diagrams/Makefile.am
new file mode 100644
index 0000000000..420bd5246c
--- /dev/null
+++ b/diagrams/Makefile.am
@@ -0,0 +1,13 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+ config.puml \
+ registry.puml \
+ netdata-for-ephemeral-nodes.xml \
+ netdata-proxies-example.xml \
+ netdata-overview.xml \
+ $(NULL)
+
+dist_noinst_SCRIPTS = \
+ build.sh \
+ $(NULL)
diff --git a/makeself/Makefile.am b/makeself/Makefile.am
new file mode 100644
index 0000000000..6287938686
--- /dev/null
+++ b/makeself/Makefile.am
@@ -0,0 +1,25 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+ $(NULL)
+
+dist_noinst_SCRIPTS = \
+ build.sh \
+ makeself.sh \
+ makeself-license.txt \
+ setup-x86_64-static.sh \
+ post-installer.sh \
+ jobs/10-prepare-destination.install.sh \
+ jobs/50-curl-7.53.1.install.sh \
+ jobs/50-bash-4.4.install.sh \
+ jobs/50-fping-4.0.install.sh \
+ jobs/70-netdata-git.install.sh \
+ jobs/99-makeself.install.sh \
+ run-all-jobs.sh \
+ install-or-update.sh \
+ build-x86_64-static.sh \
+ makeself-header.sh \
+ makeself-help-header.txt \
+ makeself.lsm \
+ functions.sh \
+ $(NULL)
diff --git a/netdata-installer.sh b/netdata-installer.sh
index 35cb850fb4..fbcd75d660 100755
--- a/netdata-installer.sh
+++ b/netdata-installer.sh
@@ -1046,6 +1046,18 @@ if [ -f /etc/init.d/netdata ]
rm -i /etc/init.d/netdata
fi
+if [ -f /etc/periodic/daily/netdata-updater ]
+ then
+ echo "Deleting /etc/periodic/daily/netdata-updater ..."
+ rm -i /etc/periodic/daily/netdata-updater
+fi
+
+if [ -f /etc/cron.daily/netdata-updater ]
+ then
+ echo "Deleting /etc/cron.daily/netdata-updater ..."
+ rm -i /etc/cron.daily/netdata-updater
+fi
+
getent passwd netdata > /dev/null
if [ $? -eq 0 ]
then
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 0000000000..624bf3d831
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,8 @@
+MAINTAINERCLEANFILES= $(srcdir)/Makefile.in
+
+dist_noinst_DATA = \
+ $(NULL)
+
+dist_noinst_SCRIPTS = \
+ stress.sh \
+ $(NULL)
diff --git a/web/dashboard.css b/web/dashboard.css
index 2147c6038d..42ffa3ddb1 100644
--- a/web/dashboard.css
+++ b/web/dashboard.css
@@ -37,6 +37,7 @@ body {
justify-content: center;
-webkit-justify-content: center;
-moz-justify-content: center;
+ padding-top: 10px;
}
.netdata-container {
diff --git a/web/dashboard.js b/web/dashboard.js
index f218dccbd2..f1a2337cfe 100644
--- a/web/dashboard.js
+++ b/web/dashboard.js
@@ -144,7 +144,7 @@ var NETDATA = window.NETDATA || {};
NETDATA.themes = {
white: {
bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-3.3.7.css',
- dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20170605-2',
+ dashboard_css: NETDATA.serverDefault + 'dashboard.css?v20170725-1',
background: '#FFFFFF',
foreground: '#000000',
grid: '#F0F0F0',
@@ -161,7 +161,7 @@ var NETDATA = window.NETDATA || {};
},
slate: {
bootstrap_css: NETDATA.serverDefault + 'css/bootstrap-slate-flat-3.3.7.css?v20161229-1',
- dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20170605-2',
+ dashboard_css: NETDATA.serverDefault + 'dashboard.slate.css?v20170725-1',
background: '#272b30',
foreground: '#C8C8C8',
grid: '#283236',
diff --git a/web/dashboard.slate.css b/web/dashboard.slate.css
index f12a6aab99..7445d532c7 100644
--- a/web/dashboard.slate.css
+++ b/web/dashboard.slate.css
@@ -51,6 +51,7 @@ code {
justify-content: center;
-moz--webkit-justify-content: center;
-moz-justify-content: center;
+ padding-top: 10px;
}
.netdata-container {
diff --git a/web/dashboard_info.js b/web/dashboard_info.js
index 91e007a1df..ffc3062d90 100644
--- a/web/dashboard_info.js
+++ b/web/dashboard_info.js
@@ -1020,6 +1020,83 @@ netdataDashboard.context = {
height: 0.5
},
+
+ // ------------------------------------------------------------------------
+ // containers
+
+ 'cgroup.cpu': {
+ mainheads: [
+ function(os, id) {
+ void(os);
+ return '<div data-netdata="' + id + '"'
+ + ' data-chart-library="gauge"'
+ + ' data-title="CPU"'
+ + ' data-units="%"'
+ + ' data-gauge-adjust="width"'
+ + ' data-width="12%"'
+ + ' data-before="0"'
+ + ' data-after="-CHART_DURATION"'
+ + ' data-points="CHART_DURATION"'
+ + ' data-colors="' + NETDATA.colors[0] + '"'
+ + ' role="application"></div>';
+ }
+ ]
+ },
+
+ 'cgroup.mem_usage': {
+ mainheads: [
+ function(os, id) {
+ void(os);
+ return '<div data-netdata="' + id + '"'
+ + ' data-chart-library="gauge"'
+ + ' data-title="Memory"'
+ + ' data-units="MB"'
+ + ' data-gauge-adjust="width"'
+ + ' data-width="12%"'
+ + ' data-before="0"'
+ + ' data-after="-CHART_DURATION"'
+ + ' data-points="CHART_DURATION"'
+ + ' data-colors="' + NETDATA.colors[1] + '"'
+ + ' role="application"></div>';
+ }
+ ]
+ },
+
+ 'cgroup.throttle_io': {
+ mainheads: [
+ function(os, id) {
+ void(os);
+ return '<div data-netdata="' + id + '"'
+ + ' data-dimensions="read"'
+ + ' data-chart-library="gauge"'
+ + ' data-title="Read Disk I/O"'
+ + ' data-units="KB/s"'
+ + ' data-gauge-adjust="width"'
+ + ' data-width="12%"'
+ + ' data-before="0"'
+ + ' data-after="-CHART_DURATION"'
+ + ' data-points="CHART_DURATION"'
+ + ' data-colors="' + NETDATA.colors[2] + '"'
+ + ' role="application"></div>';
+ },
+ function(os, id) {
+ void(os);
+ return '<div data-netdata="' + id + '"'
+ + ' data-dimensions="write"'
+ + ' data-chart-library="gauge"'
+ + ' data-title="Write Disk I/O"'
+ + ' data-units="KB/s"'
+ + ' data-gauge-adjust="width"'
+ + ' data-width="12%"'
+ + ' data-before="0"'
+ + ' data-after="-CHART_DURATION"'
+ + ' data-points="CHART_DURATION"'
+ + ' data-colors="' + NETDATA.colors[3] + '"'
+ + ' role="application"></div>';
+ }
+ ]
+ },
+
// ------------------------------------------------------------------------
// web_log
diff --git a/web/index.html b/web/index.html
index 0bb8b505d0..b742401480 100644
--- a/web/index.html
+++ b/web/index.html
@@ -2961,7 +2961,7 @@
});
NETDATA.requiredJs.push({
- url: NETDATA.serverDefault + 'dashboard_info.js?v20170530-1',
+ url: NETDATA.serverDefault + 'dashboard_info.js?v20170725-1',
async: false,
isAlreadyLoaded: function() { return false; }
});
@@ -3589,4 +3589,4 @@
</div>
</body>
</html>
-<script type="text/javascript" src="dashboard.js?v20170724-1"></script>
+<script type="text/javascript" src="dashboard.js?v20170725-1"></script>
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 22:01:56 +0000