Index: branches/2019Q3/net-mgmt/icingaweb2-module-grafana/Makefile =================================================================== --- branches/2019Q3/net-mgmt/icingaweb2-module-grafana/Makefile (revision 512270) +++ branches/2019Q3/net-mgmt/icingaweb2-module-grafana/Makefile (revision 512271) @@ -1,30 +1,30 @@ # $FreeBSD$ PORTNAME= icingaweb2-module-grafana DISTVERSIONPREFIX= v -DISTVERSION= 1.3.5 +DISTVERSION= 1.3.6 CATEGORIES= net-mgmt www MAINTAINER= lme@FreeBSD.org COMMENT= Add Grafana graphs into Icinga Web 2 to display performance metrics LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= icingaweb2>=2.4.1:net-mgmt/icingaweb2 USE_GITHUB= yes GH_ACCOUNT= mikesch-mp NO_BUILD= yes NO_ARCH= yes WWWDIR?= ${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//} do-install: - @${RM} -r ${WRKSRC}/.README.md.swp ${WRKSRC}/.github + @${RM} -r ${WRKSRC}/.idea ${WRKSRC}/.github @${MKDIR} ${STAGEDIR}${WWWDIR} (cd ${WRKSRC} && \ ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include Index: branches/2019Q3/net-mgmt/icingaweb2-module-grafana/distinfo =================================================================== --- branches/2019Q3/net-mgmt/icingaweb2-module-grafana/distinfo (revision 512270) +++ branches/2019Q3/net-mgmt/icingaweb2-module-grafana/distinfo (revision 512271) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557738901 -SHA256 (mikesch-mp-icingaweb2-module-grafana-v1.3.5_GH0.tar.gz) = c24ef277efe5a3acd14a77c59f620eff96af4fe408991fb82d7af6c3bef166ee -SIZE (mikesch-mp-icingaweb2-module-grafana-v1.3.5_GH0.tar.gz) = 1771869 +TIMESTAMP = 1568797815 +SHA256 (mikesch-mp-icingaweb2-module-grafana-v1.3.6_GH0.tar.gz) = 41bcedc6ee2b5b83695e7e16260ad7b4b633a38f181ab985ac4ab580531e9103 +SIZE (mikesch-mp-icingaweb2-module-grafana-v1.3.6_GH0.tar.gz) = 1776495 Index: branches/2019Q3/net-mgmt/icingaweb2-module-grafana/pkg-plist =================================================================== --- branches/2019Q3/net-mgmt/icingaweb2-module-grafana/pkg-plist (revision 512270) +++ branches/2019Q3/net-mgmt/icingaweb2-module-grafana/pkg-plist (revision 512271) @@ -1,130 +1,125 @@ -%%WWWDIR%%/.idea/icingaweb2-module-grafana.iml -%%WWWDIR%%/.idea/inspectionProfiles/profiles_settings.xml -%%WWWDIR%%/.idea/misc.xml -%%WWWDIR%%/.idea/modules.xml -%%WWWDIR%%/.idea/workspace.xml %%WWWDIR%%/CHANGELOG.md %%WWWDIR%%/CONTRIBUTING.md %%WWWDIR%%/LICENSE %%WWWDIR%%/README.md %%WWWDIR%%/RELEASE.md %%WWWDIR%%/application/controllers/ConfigController.php %%WWWDIR%%/application/controllers/DashboardController.php %%WWWDIR%%/application/controllers/GraphController.php %%WWWDIR%%/application/controllers/ImgController.php %%WWWDIR%%/application/controllers/ShowController.php %%WWWDIR%%/application/forms/Config/GeneralConfigForm.php %%WWWDIR%%/application/forms/Graph/GraphForm.php %%WWWDIR%%/application/views/scripts/config/index.phtml %%WWWDIR%%/application/views/scripts/dashboard/index.phtml %%WWWDIR%%/application/views/scripts/graph/index.phtml %%WWWDIR%%/application/views/scripts/graph/new.phtml %%WWWDIR%%/application/views/scripts/graph/remove.phtml %%WWWDIR%%/application/views/scripts/graph/update.phtml %%WWWDIR%%/application/views/scripts/show/index.phtml %%WWWDIR%%/configuration.php %%WWWDIR%%/dashboards/graphite/base-metrics.json %%WWWDIR%%/dashboards/graphite/icinga2-default.json %%WWWDIR%%/dashboards/graphite/itl/disk.json %%WWWDIR%%/dashboards/graphite/itl/hostalive.json %%WWWDIR%%/dashboards/graphite/itl/hostalive4.json %%WWWDIR%%/dashboards/graphite/itl/hostalive6.json %%WWWDIR%%/dashboards/graphite/itl/http.json %%WWWDIR%%/dashboards/graphite/itl/ido.json %%WWWDIR%%/dashboards/graphite/itl/load.json %%WWWDIR%%/dashboards/graphite/itl/nscp-local-cpu.json %%WWWDIR%%/dashboards/graphite/itl/nscp-local-disk.json %%WWWDIR%%/dashboards/graphite/itl/nscp-local-memory.json %%WWWDIR%%/dashboards/graphite/itl/nscp-local-pagefile.json %%WWWDIR%%/dashboards/graphite/itl/ntp_time.json %%WWWDIR%%/dashboards/graphite/itl/ping.json %%WWWDIR%%/dashboards/graphite/itl/ping4.json %%WWWDIR%%/dashboards/graphite/itl/ping6.json %%WWWDIR%%/dashboards/graphite/itl/ssh.json %%WWWDIR%%/dashboards/graphite/itl/swap.json %%WWWDIR%%/dashboards/graphite/template-graphite.json %%WWWDIR%%/dashboards/influxdb/auto-repeat-disk.json %%WWWDIR%%/dashboards/influxdb/base-metrics.json %%WWWDIR%%/dashboards/influxdb/icinga2-default.json %%WWWDIR%%/dashboards/influxdb/itl/disk.json %%WWWDIR%%/dashboards/influxdb/itl/hostalive.json %%WWWDIR%%/dashboards/influxdb/itl/hostalive4.json %%WWWDIR%%/dashboards/influxdb/itl/hostalive6.json %%WWWDIR%%/dashboards/influxdb/itl/http.json %%WWWDIR%%/dashboards/influxdb/itl/ido.json %%WWWDIR%%/dashboards/influxdb/itl/load.json %%WWWDIR%%/dashboards/influxdb/itl/nscp-local-cpu.json %%WWWDIR%%/dashboards/influxdb/itl/nscp-local-disk-free.json %%WWWDIR%%/dashboards/influxdb/itl/nscp-local-memory.json %%WWWDIR%%/dashboards/influxdb/itl/nscp-local-pagefile.json %%WWWDIR%%/dashboards/influxdb/itl/ntp_time.json %%WWWDIR%%/dashboards/influxdb/itl/ping.json %%WWWDIR%%/dashboards/influxdb/itl/ping4.json %%WWWDIR%%/dashboards/influxdb/itl/ping6.json %%WWWDIR%%/dashboards/influxdb/itl/ssh.json %%WWWDIR%%/dashboards/influxdb/itl/swap.json %%WWWDIR%%/dashboards/influxdb/template-influxdb.json %%WWWDIR%%/doc/01-about.md %%WWWDIR%%/doc/02-installation.md %%WWWDIR%%/doc/03-module-configuration.md %%WWWDIR%%/doc/04-graph-configuration.md %%WWWDIR%%/doc/05-update.md %%WWWDIR%%/doc/06-create-grafana-dashboards-influxdb.md %%WWWDIR%%/doc/07-create-grafana-dashboards-graphite.md %%WWWDIR%%/doc/images/02-installation-01.png %%WWWDIR%%/doc/images/03-module_grafana_configuration01.png %%WWWDIR%%/doc/images/04-graph.configuration-01.png %%WWWDIR%%/doc/images/04-graph.configuration-02.png %%WWWDIR%%/doc/images/04-graph.configuration-03.png %%WWWDIR%%/doc/images/04-graph.configuration-04.png %%WWWDIR%%/doc/images/04-graph.configuration-05.png %%WWWDIR%%/doc/images/04-graph.configuration-06.png %%WWWDIR%%/doc/images/04-graph.configuration-07.png %%WWWDIR%%/doc/images/06-cog.png %%WWWDIR%%/doc/images/06-create-new.png %%WWWDIR%%/doc/images/06-dashboard-add-panel.png %%WWWDIR%%/doc/images/06-dashboard-panel-axis.png %%WWWDIR%%/doc/images/06-dashboard-panel-colors.png %%WWWDIR%%/doc/images/06-dashboard-panel-display-overrides.png %%WWWDIR%%/doc/images/06-dashboard-panel-graphite-edit.png %%WWWDIR%%/doc/images/06-dashboard-panel-influx-edit.png %%WWWDIR%%/doc/images/06-dashboard-panel-legend.png %%WWWDIR%%/doc/images/06-dashboard-panel-metrics-crit-warn.png %%WWWDIR%%/doc/images/06-dashboard-panel-metrics.png %%WWWDIR%%/doc/images/06-dashboard-panel-title.png %%WWWDIR%%/doc/images/06-dashboard-panel-yaxis.png %%WWWDIR%%/doc/images/06-dashboard-panel.png %%WWWDIR%%/doc/images/06-final-dashboard-threshold-influx.png %%WWWDIR%%/doc/images/06-final-dashboard-without-threshold-influx.png %%WWWDIR%%/doc/images/06-new-button.png %%WWWDIR%%/doc/images/06-new-dashboard-with-templating.png %%WWWDIR%%/doc/images/06-templating-influx.png %%WWWDIR%%/doc/images/07-dashboard-panel-display-draw-options-graphite.png %%WWWDIR%%/doc/images/07-dashboard-panel-display-overrides-graphite.png %%WWWDIR%%/doc/images/07-dashboard-panel-graphite-edit.png %%WWWDIR%%/doc/images/07-dashboard-panel-metrics-crit-warn-graphite.png %%WWWDIR%%/doc/images/07-dashboard-panel-metrics-graphite.png %%WWWDIR%%/doc/images/07-final-dashboard-threshold-graphite.png %%WWWDIR%%/doc/images/07-final-dashboard-without-threshold-graphite.png %%WWWDIR%%/doc/images/07-templating-graphite.png %%WWWDIR%%/doc/images/grafana-datasource-graphite.png %%WWWDIR%%/doc/images/grafana-datasource-influxdb.png %%WWWDIR%%/doc/images/grafana-import-base-metrics-dashboard.png %%WWWDIR%%/doc/images/grafana-import-icinga2-default-dashboard.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_01.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_02.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_03.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_04.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_05.png %%WWWDIR%%/doc/images/icingaweb2_grafana_screenshot_06.png %%WWWDIR%%/doc/images/showallgraph.png %%WWWDIR%%/library/Grafana/Helpers/Timeranges.php %%WWWDIR%%/library/Grafana/Helpers/Util.php %%WWWDIR%%/library/Grafana/ProvidedHook/GrafanaAuthentification.php %%WWWDIR%%/library/Grafana/ProvidedHook/Grapher.php %%WWWDIR%%/library/Grafana/ProvidedHook/Monitoring/HostActions.php %%WWWDIR%%/library/Grafana/Web/Controller/MonitoringAwareController.php %%WWWDIR%%/module.info %%WWWDIR%%/public/css/module.less %%WWWDIR%%/public/js/behavior/iframe.js %%WWWDIR%%/run.php Index: branches/2019Q3 =================================================================== --- branches/2019Q3 (revision 512270) +++ branches/2019Q3 (revision 512271) Property changes on: branches/2019Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r512261