Date: Mon, 27 Apr 2020 23:07:02 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533207 - in head/net-mgmt/netdata: . files Message-ID: <202004272307.03RN72a6050630@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Mon Apr 27 23:07:02 2020 New Revision: 533207 URL: https://svnweb.freebsd.org/changeset/ports/533207 Log: net-mgmt/netdata: Update to 1.21.1 Update netdata to 1.21.1 Move cloud related changes to extra-patch Additional patch for cloud added Remove "Nodes" button when cloud support is disabled Source: https://git.progress-linux.org/distributions/engywuck-backports/packages/netdata/tree/debian/patches/debian/0011-remove-login.patch to extra-patch Tested on FreeBSD 13.0-CURRENT #0 r358620 (AMD64) Poudriere OK 12.1-RELEASE ---------------- Reset maintainer to ports@ after repeated maintainer timeout from mmokhi@. Over Daniel's submission, make libuv an unconditional requisite, and also json-c because netdata's configure.ac cannot disable it and might pick it up, leading to unregistered dependencies if json-c is available at compile time (in, for instance, portmaster or live systems). Remove the JSON option. PR: 245603 Submitted by: Daniel Engberg <daniel.engberg.lists@pyret.net> Approved by: maintainer timeout (mmokhi@, 15 days, resetting) Added: head/net-mgmt/netdata/files/extra-patch-web_gui_index.html (contents, props changed) head/net-mgmt/netdata/files/extra-patch-web_gui_main.js (contents, props changed) Modified: head/net-mgmt/netdata/Makefile head/net-mgmt/netdata/distinfo head/net-mgmt/netdata/files/patch-web_gui_index.html head/net-mgmt/netdata/pkg-plist Modified: head/net-mgmt/netdata/Makefile ============================================================================== --- head/net-mgmt/netdata/Makefile Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/Makefile Mon Apr 27 23:07:02 2020 (r533207) @@ -2,17 +2,18 @@ # $FreeBSD$ PORTNAME= netdata -PORTVERSION= 1.20.0 -PORTREVISION= 3 +PORTVERSION= 1.21.1 DISTVERSIONPREFIX= v CATEGORIES= net-mgmt -MAINTAINER= mmokhi@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Scalable distributed realtime performance and health monitoring LICENSE= GPLv3 -LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libuuid.so:misc/e2fsprogs-libuuid \ + libuv.so:devel/libuv RUN_DEPENDS= bash:shells/bash \ curl:ftp/curl \ @@ -48,13 +49,18 @@ SUB_FILES= ${PORTNAME}.conf.sample USERS= netdata GROUPS= netdata -OPTIONS_DEFINE= CUPS DBENGINE FREEIPMI GOPLUGIN JSON LTO +OPTIONS_DEFINE= CLOUD CUPS DBENGINE FREEIPMI GOPLUGIN LTO OPTIONS_SUB= YES -OPTIONS_DEFAULT= DBENGINE JSON +OPTIONS_DEFAULT= DBENGINE OPTIONS_DEFAULT_FreeBSD_12= LTO OPTIONS_DEFAULT_FreeBSD_13= LTO OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +CLOUD_DESC= Enable cloud functionality +CLOUD_CONFIGURE_OFF= --disable-cloud +CLOUD_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-web_gui_index.html \ + ${FILESDIR}/extra-patch-web_gui_main.js + CUPS_DESC= Enable support for cups CUPS_CONFIGURE_ENABLE= plugin-cups CUPS_LIB_DEPENDS= libcups.so:print/cups @@ -62,8 +68,7 @@ CUPS_LIB_DEPENDS= libcups.so:print/cups DBENGINE_DESC= Enable support for database engine DBENGINE_CONFIGURE_ENABLE= dbengine DBENGINE_LIB_DEPENDS= libJudy.so:devel/judy \ - liblz4.so:archivers/liblz4 \ - libuv.so:devel/libuv + liblz4.so:archivers/liblz4 FREEIPMI_DESC= Enable support for freeipmi FREEIPMI_CONFIGURE_ENABLE= plugin-freeipmi @@ -72,10 +77,6 @@ FREEIPMI_LIB_DEPENDS= libfreeipmi.so:sysutils/freeipm GOPLUGIN_DESC= Enable the go collector plugin GOPLUGIN_RUN_DEPENDS= ${LOCALBASE}/libexec/netdata/plugins.d/god.plugin:net-mgmt/netdata-go -JSON_DESC= Enable support for json -JSON_CONFIGURE_ENABLE= jsonc -JSON_LIB_DEPENDS= libjson-c.so:devel/json-c - LTO_DESC= Use Link-Time Optimization LTO_CONFIGURE_ENABLE= lto LTO_USES= compiler:c11 @@ -103,9 +104,9 @@ post-install: ${MKDIR} ${STAGEDIR}${NETDATA_CACHE} ${MKDIR} ${STAGEDIR}${NETDATA_LOG} ${MKDIR} ${STAGEDIR}${NETDATA_PERST} - (for file in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ + (for fi in ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*.conf \ ${STAGEDIR}${LOCALBASE}/lib/${PORTNAME}/conf.d/*/*.conf; do \ - ${MV} $$file $$file".sample"; \ + ${MV} $$fi $$fi".sample"; \ done) .include <bsd.port.mk> Modified: head/net-mgmt/netdata/distinfo ============================================================================== --- head/net-mgmt/netdata/distinfo Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/distinfo Mon Apr 27 23:07:02 2020 (r533207) @@ -1,3 +1,3 @@ -TIMESTAMP = 1583350154 -SHA256 (netdata-netdata-v1.20.0_GH0.tar.gz) = c739e0fa8d6d7f433c0c7c8016b763e8f70519d67f0b5e7eca9ee5318f210d90 -SIZE (netdata-netdata-v1.20.0_GH0.tar.gz) = 3598521 +TIMESTAMP = 1587324548 +SHA256 (netdata-netdata-v1.21.1_GH0.tar.gz) = 60cdde3f1f8bd9035fef6a566053c0a7195d1714b5da6814473263e85382b4a8 +SIZE (netdata-netdata-v1.21.1_GH0.tar.gz) = 3748090 Added: head/net-mgmt/netdata/files/extra-patch-web_gui_index.html ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netdata/files/extra-patch-web_gui_index.html Mon Apr 27 23:07:02 2020 (r533207) @@ -0,0 +1,28 @@ +--- web/gui/index.html.orig 2020-04-13 16:02:25 UTC ++++ 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> <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> + <!-- +@@ -114,6 +116,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? +@@ -124,6 +127,7 @@ + </div> + </div> + </div> ++--> + + <div id="masthead" style="display: none;"> + <div class="container"> Added: head/net-mgmt/netdata/files/extra-patch-web_gui_main.js ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/netdata/files/extra-patch-web_gui_main.js Mon Apr 27 23:07:02 2020 (r533207) @@ -0,0 +1,13 @@ +--- web/gui/main.js.orig 2020-04-06 01:28:55 UTC ++++ web/gui/main.js +@@ -4923,9 +4923,7 @@ function renderAccountUI() { + container.setAttribute("data-original-title", "sign in"); + container.setAttribute("data-placement", "bottom"); + container.innerHTML = ( +- `<a href="#" class="btn sign-in-btn theme-${netdataTheme}" onclick="signInDidClick(event); return false"> +- <i class="fas fa-sign-in-alt"></i> <span class="hidden-sm hidden-md">Sign In</span> +- </a>` ++ `` + ) + } + } Modified: head/net-mgmt/netdata/files/patch-web_gui_index.html ============================================================================== --- head/net-mgmt/netdata/files/patch-web_gui_index.html Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/files/patch-web_gui_index.html Mon Apr 27 23:07:02 2020 (r533207) @@ -1,4 +1,4 @@ ---- web/gui/index.html.orig 2020-02-21 01:50:30 UTC +--- web/gui/index.html.orig 2020-04-06 01:28:55 UTC +++ web/gui/index.html @@ -93,10 +93,14 @@ <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> @@ -15,19 +15,3 @@ <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> -@@ -110,6 +114,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 +125,7 @@ - </div> - </div> - </div> -+--> - - <div id="masthead" style="display: none;"> - <div class="container"> Modified: head/net-mgmt/netdata/pkg-plist ============================================================================== --- head/net-mgmt/netdata/pkg-plist Mon Apr 27 22:20:40 2020 (r533206) +++ head/net-mgmt/netdata/pkg-plist Mon Apr 27 23:07:02 2020 (r533207) @@ -28,6 +28,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/cpu.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dbengine.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/disks.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dns_query.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dnsmasq_dhcp.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/dockerd.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/elasticsearch.conf.sample @@ -63,6 +64,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/portcheck.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/postgres.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/processes.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/pulsar.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/qos.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/ram.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/redis.conf.sample @@ -82,6 +84,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/unbound.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/varnish.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vcsa.conf.sample +@sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vernemq.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/vsphere.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/web_log.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health.d/wmi.conf.sample @@ -91,7 +94,6 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/health_alarm_notify.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/health_email_recipients.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/ioping.conf.sample -@sample(netdata,netdata,0640) lib/netdata/conf.d/mongodb.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/node.d.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/adaptec_raid.conf.sample @@ -164,6 +166,7 @@ @sample(netdata,netdata,0640) lib/netdata/conf.d/python.d/web_log.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/statsd.d/example.conf.sample @sample(netdata,netdata,0640) lib/netdata/conf.d/stream.conf.sample +libexec/netdata/netdata-switch-dashboard.sh libexec/netdata/charts.d/ap.chart.sh libexec/netdata/charts.d/apcupsd.chart.sh libexec/netdata/charts.d/example.chart.sh
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004272307.03RN72a6050630>