diff options
| -rw-r--r-- | debian/patches/debian/0006-remove-infographic.patch | 14 | ||||
| -rw-r--r-- | debian/patches/debian/0007-remove-contrib-files.patch | 49 | ||||
| -rw-r--r-- | debian/patches/debian/0008-remove-update-button.patch | 14 | ||||
| -rw-r--r-- | debian/patches/debian/0009-remove-social-media-buttons.patch | 16 | ||||
| -rw-r--r-- | debian/patches/debian/0010-remove-googleanalytics.patch | 89 | ||||
| -rw-r--r-- | debian/patches/debian/0011-remove-signin.patch | 24 | ||||
| -rw-r--r-- | debian/patches/debian/0012-remove-googlefonts.patch | 14 | ||||
| -rw-r--r-- | debian/patches/debian/0013-remove-googletagmanager.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 8 |
9 files changed, 0 insertions, 266 deletions
diff --git a/debian/patches/debian/0006-remove-infographic.patch b/debian/patches/debian/0006-remove-infographic.patch deleted file mode 100644 index 5a8a8af07..000000000 --- a/debian/patches/debian/0006-remove-infographic.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Lennart Weller <lhw@ring0.de> -Description: Remove infographic for privacy breach reasons. - -diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am ---- netdata.orig/web/gui/Makefile.am 2019-11-28 05:53:29.205928576 +0100 -+++ netdata/web/gui/Makefile.am 2019-11-28 06:00:04.581935523 +0100 -@@ -62,7 +62,6 @@ dist_web_DATA = \ - main.css \ - main.js \ - console.html \ -- infographic.html \ - robots.txt \ - refresh-badges.js \ - sitemap.xml \ diff --git a/debian/patches/debian/0007-remove-contrib-files.patch b/debian/patches/debian/0007-remove-contrib-files.patch deleted file mode 100644 index 9c5e99b12..000000000 --- a/debian/patches/debian/0007-remove-contrib-files.patch +++ /dev/null @@ -1,49 +0,0 @@ -Author: Lennart Weller <lhw@ring0.de> -Description: Remove unused contrib files. - -diff -Naurp netdata.orig/web/gui/Makefile.am netdata/web/gui/Makefile.am ---- netdata.orig/web/gui/Makefile.am -+++ netdata/web/gui/Makefile.am -@@ -46,10 +46,6 @@ dist_noinst_DATA = \ - $(NULL) - - dist_web_DATA = \ -- demo.html \ -- demo2.html \ -- demosites.html \ -- demosites2.html \ - dashboard.html \ - dashboard.js \ - dashboard_info.js \ -@@ -110,15 +106,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/netdata-logomark.svg \ -@@ -163,15 +150,6 @@ dashboard.js: $(DASHBOARD_JS_FILES) - if test -f $@; then rm -f $@; fi - cat $(DASHBOARD_JS_FILES) > $@.tmp && mv $@.tmp $@ - --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; \ diff --git a/debian/patches/debian/0008-remove-update-button.patch b/debian/patches/debian/0008-remove-update-button.patch deleted file mode 100644 index 393f48a5e..000000000 --- a/debian/patches/debian/0008-remove-update-button.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Federico Ceratto <federico.ceratto@gmail.com> -Description: Remove update button in web gui. - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -93,7 +93,6 @@ - <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li> - <li id="alarmsButton" title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i> <span class="hidden-sm hidden-md">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li> - <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i> <span class="hidden-sm hidden-md">Settings</span></a></li> -- <li title="check for netdata updates<br/>you should keep your netdata updated" data-toggle="tooltip" data-placement="bottom" class="hidden-sm" id="updateButton"><a href="#" class="btn" data-toggle="modal" data-target="#updateModal"><i class="fas fa-cloud-download-alt"></i> <span class="hidden-sm hidden-md">Update </span><span id="update_badge" class="badge"></span></a></li> - <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> - <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> - <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> diff --git a/debian/patches/debian/0009-remove-social-media-buttons.patch b/debian/patches/debian/0009-remove-social-media-buttons.patch deleted file mode 100644 index 49b58919c..000000000 --- a/debian/patches/debian/0009-remove-social-media-buttons.patch +++ /dev/null @@ -1,16 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Description: Remove social media buttons in web gui. - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -93,9 +93,6 @@ - <li title="Nodes view" data-toggle="tooltip" data-placement="bottom"><a onclick="openAuthenticatedUrl('console.html');" class="btn" target="_blank"><i class="fas fa-tv"></i> <span class="hidden-sm hidden-md">Nodes<sup class="beta"> beta</sup></span></a></li> - <li id="alarmsButton" title="check the health monitoring alarms and their log" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#alarmsModal"><i class="fas fa-bell"></i> <span class="hidden-sm hidden-md">Alarms </span><span id="alarms_count_badge" class="badge"></span></a></li> - <li title="change dashboard settings" data-toggle="tooltip" data-placement="bottom"><a href="#" class="btn" data-toggle="modal" data-target="#optionsModal"><i class="fas fa-cog"></i> <span class="hidden-sm hidden-md">Settings</span></a></li> -- <li title="the netdata wiki home at github<br/>remember to <b>give netdata a <i class="fas fa-star"></i></b> !" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://github.com/netdata/netdata" class="btn" target="_blank"><i class="fab fa-github"></i></a></li> -- <li title="follow netdata on twitter" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://twitter.com/linuxnetdata" class="btn" target="_blank"><i class="fab fa-twitter"></i></a></li> -- <li title="like netdata on facebook" data-toggle="tooltip" data-placement="bottom" class="hidden-xs hidden-sm hidden-md"><a href="https://www.facebook.com/linuxnetdata/" class="btn" target="_blank"><i class="fab fa-facebook"></i></a></li> - <li title="import / load a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="loadButton"><a href="#" class="btn" data-toggle="modal" data-target="#loadSnapshotModal"><i class="fas fa-download"></i> <span class="hidden-sm hidden-md hidden-lg">Import</span></a></li> - <li title="export / save a netdata snapshot" data-toggle="tooltip" data-placement="bottom" id="saveButton"><a href="#" class="btn" data-toggle="modal" data-target="#saveSnapshotModal"><i class="fas fa-upload"></i> <span class="hidden-sm hidden-md hidden-lg">Export</span></a></li> - <li title="print this dashboard to PDF" data-toggle="tooltip" data-placement="bottom" id="printButton"><a href="#" class="btn" data-toggle="modal" data-target="#printPreflightModal"><i class="fas fa-print"></i> <span class="hidden-sm hidden-md hidden-lg">Print</span></a></li> diff --git a/debian/patches/debian/0010-remove-googleanalytics.patch b/debian/patches/debian/0010-remove-googleanalytics.patch deleted file mode 100644 index 3bc8a4afe..000000000 --- a/debian/patches/debian/0010-remove-googleanalytics.patch +++ /dev/null @@ -1,89 +0,0 @@ -Author: Lennart Weller <lhw@ring0.de> -Subject: Remove googleanalytics - -diff -Naurp netdata.orig/web/gui/demosites2.html netdata/web/gui/demosites2.html ---- netdata.orig/web/gui/demosites2.html 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/demosites2.html 2021-02-07 13:00:35.014255664 +0100 -@@ -1096,17 +1096,4 @@ - </div> - </div> - </body> --<script> -- // google analytics when this is used for the home page of the demo sites -- // you don't need this if you customize this dashboard for your needs -- setTimeout(function() { -- (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ -- (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), -- m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) -- })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); -- -- ga('create', 'UA-64295674-3', 'auto'); -- ga('send', 'pageview'); -- }, 2000); --</script> - </html> -diff -Naurp netdata.orig/web/gui/demosites.html netdata/web/gui/demosites.html ---- netdata.orig/web/gui/demosites.html 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/demosites.html 2021-02-07 12:59:33.954375891 +0100 -@@ -1385,14 +1385,6 @@ p { - }(c))) - } - -- function o() { -- !function (t, e, a, n, o, i) { -- t.GoogleAnalyticsObject = n, t[n] || (t[n] = function () { -- (t[n].q = t[n].q || []).push(arguments) -- }), t[n].l = +new Date, o = e.createElement(a), i = e.getElementsByTagName(a)[0], o.src = "//www.google-analytics.com/analytics.js", i.parentNode.insertBefore(o, i) -- }(t, r, "script", "ga"), ga("create", "UA-64295674-3", "auto"), ga("send", "pageview", "/site"+window.location.pathname), t.document.addEventListener("click", n) -- } -- - function i() { - !function (t, e, a) { - var n, o = t.getElementsByTagName(e)[0]; -diff -Naurp netdata.orig/web/gui/infographic.html netdata/web/gui/infographic.html ---- netdata.orig/web/gui/infographic.html 2021-02-03 14:09:31.000000000 +0100 -+++ netdata/web/gui/infographic.html 2021-02-07 13:00:20.950283510 +0100 -@@ -126,14 +126,6 @@ - }(c))) - } - -- function o() { -- !function (t, e, a, n, o, i) { -- t.GoogleAnalyticsObject = n, t[n] || (t[n] = function () { -- (t[n].q = t[n].q || []).push(arguments) -- }), t[n].l = +new Date, o = e.createElement(a), i = e.getElementsByTagName(a)[0], o.src = "//www.google-analytics.com/analytics.js", i.parentNode.insertBefore(o, i) -- }(t, r, "script", "ga"), ga("create", "UA-64295674-3", "auto"), ga("send", "pageview"), t.document.addEventListener("click", n) -- } -- - function i() { - !function (t, e, a) { - var n, o = t.getElementsByTagName(e)[0]; -diff -Naurp netdata.orig/web/gui/main.js netdata/web/gui/main.js ---- netdata.orig/web/gui/main.js 2021-02-07 12:48:55.307522425 +0100 -+++ netdata/web/gui/main.js 2021-02-07 13:00:13.098299018 +0100 -@@ -4460,25 +4460,6 @@ function finalizePage() { - if (isdemo()) { - // do not to give errors on netdata demo servers for 60 seconds - NETDATA.options.current.retries_on_data_failures = 60; -- -- // google analytics when this is used for the home page of the demo sites -- // this does not run on user's installations -- setTimeout(function () { -- (function (i, s, o, g, r, a, m) { -- i['GoogleAnalyticsObject'] = r; -- i[r] = i[r] || function () { -- (i[r].q = i[r].q || []).push(arguments) -- }, i[r].l = 1 * new Date(); -- a = s.createElement(o), -- m = s.getElementsByTagName(o)[0]; -- a.async = 1; -- a.src = g; -- m.parentNode.insertBefore(a, m) -- })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga'); -- -- ga('create', 'UA-64295674-3', 'auto'); -- ga('send', 'pageview', '/demosite/' + window.location.host); -- }, 2000); - } else { - notifyForUpdate(); - } diff --git a/debian/patches/debian/0011-remove-signin.patch b/debian/patches/debian/0011-remove-signin.patch deleted file mode 100644 index a3c68ca7c..000000000 --- a/debian/patches/debian/0011-remove-signin.patch +++ /dev/null @@ -1,24 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Description: Removing 'Sign In' infobar on the bottom of the screen (Closes: #930504). - -diff -Naurp netdata.orig/web/gui/index.html netdata/web/gui/index.html ---- netdata.orig/web/gui/index.html -+++ netdata/web/gui/index.html -@@ -106,17 +106,6 @@ - <div id="navbar-highlight-content" class="navbar-highlight-content"></div> - </div> - -- <div id="sign-in-banner" style="display: none"> -- <div class="container"> -- Like what you see? -- <strong><a href="#" class="__link" onclick="signInDidClick(event); return false">Sign in</a> -- to experience the full-range of netdata capabilities!</strong> -- <div class="__close" onclick="closeSignInBannerDidClick(event)"> -- Close <i class="fas fa-times"></i> -- </div> -- </div> -- </div> -- - <div id="masthead" style="display: none;"> - <div class="container"> - <div class="row"> diff --git a/debian/patches/debian/0012-remove-googlefonts.patch b/debian/patches/debian/0012-remove-googlefonts.patch deleted file mode 100644 index c5ef60ae5..000000000 --- a/debian/patches/debian/0012-remove-googlefonts.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Subject: Remove Google Fonts for privacy reasons. - -diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html ---- netdata.orig/web/gui/console.html -+++ netdata/web/gui/console.html -@@ -11,7 +11,6 @@ - <meta name="apple-mobile-web-app-capable" content="yes" /> - <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> - <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" /> -- <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" /> - <!-- Google Tag Manager --> - <script>(function (w, d, s, l, i) { - w[l] = w[l] || []; w[l].push({ diff --git a/debian/patches/debian/0013-remove-googletagmanager.patch b/debian/patches/debian/0013-remove-googletagmanager.patch deleted file mode 100644 index 2cface0eb..000000000 --- a/debian/patches/debian/0013-remove-googletagmanager.patch +++ /dev/null @@ -1,38 +0,0 @@ -Author: Daniel Baumann <daniel.baumann@progress-linux.org> -Subject: Remove Google Tag Manager for privacy reasons. - -diff -Naurp netdata.orig/web/gui/console.html netdata/web/gui/console.html ---- netdata.orig/web/gui/console.html -+++ netdata/web/gui/console.html -@@ -11,18 +11,6 @@ - <meta name="apple-mobile-web-app-capable" content="yes" /> - <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> - <link rel="icon" href="data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAP9JREFUeNpiYBgFo+A/w34gpiZ8DzWzAYgNiHGAA5UdgA73g+2gcyhgg/0DGQoweB6IBQYyFCCOGOBQwBMd/xnW09ERDtgcoEBHB+zHFQrz6egIBUasocDAcJ9OxWAhE4YQI8MDILmATg7wZ8QRDfQKhQf4Cie6pAVGPA4AhQKo0BCgZRAw4ZSBpIWJNI6CD4wEKikBaFqgVSgcYMIrzcjwgcahcIGRiPYCLUPBkNhWUwP9akVcoQBpatG4MsLviAIqWj6f3Absfdq2igg7IIEKDVQKEzN5ofAenJCp1I8gJRTug5tfkGIdR1FDniMI+QZUjF8Amn5htOdHCAAEGACE6B0cS6mrEwAAAABJRU5ErkJggg==" /> -- <!-- Google Tag Manager --> -- <script>(function (w, d, s, l, i) { -- w[l] = w[l] || []; w[l].push({ -- 'gtm.start': -- new Date().getTime(), event: 'gtm.js' -- }); var f = d.getElementsByTagName(s)[0], -- j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src = -- 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f); -- })(window, document, 'script', 'dataLayer', 'GTM-N6CBMJD'); -- window.dataLayer = window.dataLayer || []; -- </script> -- <!-- End Google Tag Manager --> - <script> - function loadJSFile(filename) { - const s = document.createElement("script") -@@ -46,12 +34,6 @@ - </head> - - <body class="mdc-theme--background mdc-typography"> -- <!-- Google Tag Manager (noscript) --> -- <noscript> -- <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6CBMJD" height="0" width="0" -- style="display:none;visibility:hidden"></iframe> -- </noscript> -- <!-- End Google Tag Manager (noscript) --> - <main id="app" class="console-app" data-host="agent"></main> - <script> - const main = document.getElementById("app") diff --git a/debian/patches/series b/debian/patches/series index 0be909bad..7d8318f10 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,13 +3,5 @@ debian/0002-use-system-exim4.patch debian/0003-use-python3.patch debian/0004-use-sh.patch debian/0005-use-bash.patch -debian/0006-remove-infographic.patch -debian/0007-remove-contrib-files.patch -debian/0008-remove-update-button.patch -debian/0009-remove-social-media-buttons.patch -debian/0010-remove-googleanalytics.patch -debian/0011-remove-signin.patch -debian/0012-remove-googlefonts.patch -debian/0013-remove-googletagmanager.patch upstream/0001-allow-symlinks.patch upstream/0002-fix-FTCBFS.patch |