diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 090b070..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -RELEASE.md -.idea diff --git a/CHANGELOG.md b/CHANGELOG.md index be99787..9d916ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,19 @@ # Change Log -## [1.3.5](https://github.com/mikesch-mp/icingaweb2-module-grafana/tree/1.3.5) (2019-05-12) -[Full Changelog](https://github.com/mikesch-mp/icingaweb2-module-grafana/compare/v1.3.4...1.3.5) +## [1.3.6](https://github.com/mikesch-mp/icingaweb2-module-grafana/tree/1.3.6) (2019-09-07) +[Full Changelog](https://github.com/mikesch-mp/icingaweb2-module-grafana/compare/v1.3.5...1.3.6) + +**Closed issues:** + +- Some services not shown in Icingaweb2 2.7.1 when grafana module enabled [\#221](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/221) +- 'No data points' on host objects with spaces in the name [\#219](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/219) +- \[Feature request\] Custom vars in graph menu [\#217](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/217) +- Question concerning the 2 dashboards [\#216](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/216) +- Timelegend is shown UTC and not Browser / php time [\#215](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/215) +- Icinga2 not get all the graphs from grafana , got only ping4 graph [\#197](https://github.com/Mikesch-mp/icingaweb2-module-grafana/issues/197) + +## [v1.3.5](https://github.com/mikesch-mp/icingaweb2-module-grafana/tree/v1.3.5) (2019-05-12) +[Full Changelog](https://github.com/mikesch-mp/icingaweb2-module-grafana/compare/v1.3.4...v1.3.5) **Implemented enhancements:** diff --git a/module.info b/module.info index 6c1ed2e..ca8a29e 100644 --- a/module.info +++ b/module.info @@ -1,5 +1,5 @@ Name: Grafana -Version: 1.3.5 +Version: 1.3.6 Depends: monitoring Description: Grafana - A perfdata visualisation module Shows Grafana graphs for captured metrics. diff --git a/public/js/behavior/iframe.js b/public/js/behavior/iframe.js index 1ce850b..1665ee5 100644 --- a/public/js/behavior/iframe.js +++ b/public/js/behavior/iframe.js @@ -50,7 +50,7 @@ $child.children().each(function(contentIdx) { var $contentChild = $(this); // All the iframes we use have this class, overwrite any others - if (!$contentChild.hasClass('module-grafana')) { + if (!$contentChild.hasClass('module-grafana') || $contentChild.hasClass('quick-actions')) { $($contentChildren[contentIdx]).html($contentChild.html()); } });