Browse Source

Merge pull request #16339 from paper42/netdata-1.31

netdata: update to version 1.33.1
lilik-openwrt-22.03
Josef Schlehofer 3 years ago
committed by GitHub
parent
commit
222d04e810
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1449 additions and 50 deletions
  1. +11
    -4
      admin/netdata/Makefile
  2. +0
    -28
      admin/netdata/patches/002-extra-patch-web_gui_index.html.patch
  3. +0
    -0
      admin/netdata/patches/002-extra-patch-web_gui_main.js.patch
  4. +1
    -1
      admin/netdata/patches/003-patch-collectors_python.d.plugin_Makefile.am.patch
  5. +0
    -0
      admin/netdata/patches/004-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch
  6. +1437
    -0
      admin/netdata/patches/005-freebsd.patch
  7. +0
    -17
      admin/netdata/patches/006-patch-web_gui_index.html.patch

+ 11
- 4
admin/netdata/Makefile View File

@ -8,8 +8,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=netdata
PKG_VERSION:=1.30.1
PKG_RELEASE:=2
PKG_VERSION:=1.33.1
PKG_RELEASE:=$(AUTORELEASE)
PKG_MAINTAINER:=Josef Schlehofer <pepe.schlehofer@gmail.com>, Daniel Engberg <daniel.engberg.lists@pyret.net>
PKG_LICENSE:=GPL-3.0-or-later
@ -17,8 +17,9 @@ PKG_LICENSE_FILES:=COPYING
PKG_CPE_ID:=cpe:/a:my-netdata:netdata
PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/netdata/netdata/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=e05f8b59d283fb2844280455b9481a2f9104730fd77f535312ff2fec40a6bc11
PKG_SOURCE_URL:=https://github.com/netdata/netdata/releases/download/v$(PKG_VERSION)
PKG_HASH:=20ba8695d87187787b27128ac3aab9b09aa29ca6b508c48542e0f7d50ec9322b
PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-v$(PKG_VERSION)
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
@ -62,8 +63,14 @@ CONFIGURE_ARGS += \
--disable-plugin-xenstat \
--disable-backend-prometheus-remote-write \
--disable-unit-tests \
--disable-ml \
--disable-cloud
define Build/Configure
$(SED) 's/m4_esyscmd(\[git describe .*\])/$(PKG_VERSION)/' $(PKG_BUILD_DIR)/configure.ac
$(Build/Configure/Default)
endef
define Package/netdata/conffiles
/etc/netdata/
endef


+ 0
- 28
admin/netdata/patches/002-extra-patch-web_gui_index.html.patch View File

@ -1,28 +0,0 @@
--- a/web/gui/index.html
+++ b/web/gui/index.html
@@ -90,7 +90,9 @@
</div>
<nav class="collapse navbar-collapse navbar-right" role="navigation">
<ul class="nav navbar-nav">
+ <!--
<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>&nbsp;<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>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</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>&nbsp;<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>
@@ -110,6 +112,7 @@
<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?
@@ -120,6 +123,7 @@
</div>
</div>
</div>
+-->
<div id="masthead" style="display: none;">
<div class="container">

admin/netdata/patches/003-extra-patch-web_gui_main.js.patch → admin/netdata/patches/002-extra-patch-web_gui_main.js.patch View File


admin/netdata/patches/004-patch-collectors_python.d.plugin_Makefile.am.patch → admin/netdata/patches/003-patch-collectors_python.d.plugin_Makefile.am.patch View File


admin/netdata/patches/005-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch → admin/netdata/patches/004-patch-collectors_python.d.plugin_python__modules_bases_loaders.py.patch View File


+ 1437
- 0
admin/netdata/patches/005-freebsd.patch
File diff suppressed because it is too large
View File


+ 0
- 17
admin/netdata/patches/006-patch-web_gui_index.html.patch View File

@ -1,17 +0,0 @@
--- a/web/gui/index.html
+++ b/web/gui/index.html
@@ -95,10 +95,14 @@
-->
<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>&nbsp;<span class="hidden-sm hidden-md">Alarms&nbsp;</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>&nbsp;<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=&quot;fas fa-star&quot;></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>&nbsp;<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>&nbsp;<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>&nbsp;<span class="hidden-sm hidden-md hidden-lg">Print</span></a></li>

Loading…
Cancel
Save