Merge pull request #122 from flant/fix_0_3_2

fix: plugin.json fields and relative links in README.md
2026-07-21 23:42:03 +00:00 · 2020-08-13 14:35:30 +03:00 · 2020-08-13 14:23:25 +03:00 · 2020-07-21 17:51:35 +03:00 · 2020-07-21 17:49:57 +03:00 · 2020-07-21 17:43:24 +03:00
13 changed files with 35 additions and 33 deletions
@@ -1,5 +1,9 @@
 # Changelog

+## v0.3.1
+
+- Fix to work in Grafana 7.1.0
+
 ## v0.3.0

 - Tooltip freeze on click
@@ -28,7 +28,7 @@
 * Tested with Grafana:
  - 5.4.3
  - 6.3, 6.6, 6.7
-  - 7.0
+  - 7.0, 7.1

 ## Installation

@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a

 #### Pagination

-![Pagination controls](src/img/pagination-graph.png)
+![Pagination controls](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/pagination-graph.png)

 __Enable pagination__ toggles pagination controls on graph.

@@ -192,7 +192,7 @@ __Rows per page__ a number of rows to display on graph.

 #### Tooltip

-![Tooltip in frozen state](src/img/tooltip-frozen.png)
+![Tooltip in frozen state](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-frozen.png)

 __Show tooltip__ toggles tooltip display on mouse over buckets.

@@ -204,7 +204,7 @@ __Items__ is a list of definitions to display URLs in tooltip.

 Each URL has a template, icon, label and formating options: lowercase and date format for variables.

-![Tooltip items editor](src/img/tooltip-editor.png)
+![Tooltip items editor](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-editor.png)

 ## Development

@@ -215,7 +215,7 @@ the directory containing Statusmap plugin):
 docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \
           -p 3000:3000 --name grafana.docker \
           --env=GF_USERS_DEFAULT_THEME=light \
-           grafana/grafana:5.1.3
+           grafana/grafana:7.1.3
 ```

 This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile
@@ -1,5 +1,9 @@
 # Changelog

+## v0.3.1
+
+- Fix to work in Grafana 7.1.0
+
 ## v0.3.0

 - Tooltip freeze on click
@@ -28,7 +28,7 @@
 * Tested with Grafana:
  - 5.4.3
  - 6.3, 6.6, 6.7
-  - 7.0
+  - 7.0, 7.1

 ## Installation

@@ -184,7 +184,7 @@ __Rows sort__ can be used to sort labels on Y axis. Metrics — sort y labels a

 #### Pagination

-![Pagination controls](src/img/pagination-graph.png)
+![Pagination controls](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/pagination-graph.png)

 __Enable pagination__ toggles pagination controls on graph.

@@ -192,7 +192,7 @@ __Rows per page__ a number of rows to display on graph.

 #### Tooltip

-![Tooltip in frozen state](src/img/tooltip-frozen.png)
+![Tooltip in frozen state](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-frozen.png)

 __Show tooltip__ toggles tooltip display on mouse over buckets.

@@ -204,7 +204,7 @@ __Items__ is a list of definitions to display URLs in tooltip.

 Each URL has a template, icon, label and formating options: lowercase and date format for variables.

-![Tooltip items editor](src/img/tooltip-editor.png)
+![Tooltip items editor](https://raw.githubusercontent.com/flant/grafana-statusmap/master/src/img/tooltip-editor.png)

 ## Development

@@ -215,7 +215,7 @@ the directory containing Statusmap plugin):
 docker run --rm -it -v $PWD:/var/lib/grafana/plugins/flant-statusmap-panel \
           -p 3000:3000 --name grafana.docker \
           --env=GF_USERS_DEFAULT_THEME=light \
-           grafana/grafana:5.1.3
+           grafana/grafana:7.1.3
 ```

 This will expose local plugin from your machine to Grafana container. Now run `grunt` to compile
@@ -163,21 +163,20 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
      _export("PanelCtrl", _export("StatusHeatmapCtrl", StatusHeatmapCtrl =
      /*#__PURE__*/
      function (_MetricsPanelCtrl) {
-        StatusHeatmapCtrl.$inject = ["$scope", "$injector", "timeSrv", "annotationsSrv", "$window", "datasourceSrv", "variableSrv", "templateSrv"];
+        StatusHeatmapCtrl.$inject = ["$scope", "$injector", "annotationsSrv"];

        _inherits(StatusHeatmapCtrl, _MetricsPanelCtrl);

        // TODO remove this transient variable: use ng-model-options="{ getterSetter: true }"

        /** @ngInject */
-        function StatusHeatmapCtrl($scope, $injector, timeSrv, annotationsSrv, $window, datasourceSrv, variableSrv, templateSrv) {
+        function StatusHeatmapCtrl($scope, $injector, annotationsSrv) {
          var _this;

          _classCallCheck(this, StatusHeatmapCtrl);

          _this = _possibleConstructorReturn(this, _getPrototypeOf(StatusHeatmapCtrl).call(this, $scope, $injector));
          _this.annotationsSrv = annotationsSrv;
-          _this.variableSrv = variableSrv;

          _defineProperty(_assertThisInitialized(_this), "data", void 0);

@@ -312,7 +311,6 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
          };
          _this.annotations = [];
          _this.annotationsSrv = annotationsSrv;
-          _this.timeSrv = timeSrv;

          _this.events.on(PanelEvents.render, _this.onRender.bind(_assertThisInitialized(_this)));

@@ -81,9 +81,7 @@
          </div>
          <div class="gf-form">
            <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
-                <i class="fa fa-trash"/>
-              </a>
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
            </label>
          </div>
        </div>
@@ -24,11 +24,12 @@
      {"name": "Color mapping", "path": "img/color-mapping.png"},
      {"name": "Queries example", "path": "img/queries-example.png"}
    ],
-    "version": "0.3.0",
-    "updated": "2020-07-14"
+    "version": "0.3.2",
+    "updated": "2020-08-13"
  },

  "dependencies": {
+    "grafanaDependency": ">=5.4.3",
    "grafanaVersion": "5.4.x",
    "plugins": [ ]
  }
@@ -3580,7 +3580,7 @@
    },
    "chalk": {
      "version": "1.1.3",
-      "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
      "dev": true,
      "requires": {
@@ -7794,9 +7794,9 @@
      }
    },
    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
    },
    "lodash.memoize": {
      "version": "4.1.2",
@@ -56,7 +56,7 @@
  "dependencies": {
    "d3": "4.13.0",
    "d3-scale-chromatic": "1.5.0",
-    "lodash": "4.17.15",
+    "lodash": "4.17.19",
    "moment": "2.24.0"
  }
 }
@@ -144,7 +144,7 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
  };

  /** @ngInject */
-  constructor($scope: any, $injector: auto.IInjectorService, timeSrv, private annotationsSrv: AnnotationsSrv, $window, datasourceSrv, public variableSrv: any, templateSrv) {
+  constructor($scope: any, $injector: auto.IInjectorService, private annotationsSrv: AnnotationsSrv) {
    super($scope, $injector);

    if(!Polygrafill.hasAppEventCompatibleEmitter(this.events)){
@@ -197,8 +197,6 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
    this.annotations = [];
    this.annotationsSrv = annotationsSrv;

-    this.timeSrv = timeSrv;
-
    this.events.on(PanelEvents.render, this.onRender.bind(this));
    this.events.on(PanelEvents.dataReceived, this.onDataReceived.bind(this));
    this.events.on(PanelEvents.dataError, this.onDataError.bind(this));
@@ -81,9 +81,7 @@
          </div>
          <div class="gf-form">
            <label class="gf-form-label">
-              <a class="pointer" tabindex="1" ng-click="editor.onRemoveThreshold($index)">
-                <i class="fa fa-trash"/>
-              </a>
+              <i class="fa fa-trash pointer" ng-click="editor.onRemoveThreshold($index)"></i>
            </label>
          </div>
        </div>
@@ -24,11 +24,12 @@
      {"name": "Color mapping", "path": "img/color-mapping.png"},
      {"name": "Queries example", "path": "img/queries-example.png"}
    ],
-    "version": "0.3.0",
-    "updated": "2020-07-14"
+    "version": "0.3.2",
+    "updated": "2020-08-13"
  },

  "dependencies": {
+    "grafanaDependency": ">=5.4.3",
    "grafanaVersion": "5.4.x",
    "plugins": [ ]
  }
Author	SHA1	Message	Date
Ivan MikheykinandGitHub	9a2e4a394e	Merge pull request #122 from flant/fix_0_3_2 fix: plugin.json fields and relative links in README.md	2020-08-13 14:35:30 +03:00
Ivan Mikheykin	4bd3ecbcf2	fix: plugin.json fields and relative links in README.md	2020-08-13 14:23:25 +03:00
Ivan MikheykinandGitHub	4b7d111cd6	Merge pull request #119 from flant/fix_0_3_1 fix: set version to 0.3.1	2020-07-21 17:51:35 +03:00
Ivan Mikheykin	80725f6cd5	fix: set version to 0.3.1	2020-07-21 17:49:57 +03:00
Ivan MikheykinandGitHub	3e37a0c3cc	Merge pull request #118 from flant/fix_for_7_1_0 fix: Grafana 7.1.0 compatibility	2020-07-21 17:43:24 +03:00
Ivan Mikheykin	a4d48eb591	fix: Grafana 7.1.0 compatibility - remove unused injections from module's constructor - fix trash icon multiplication in options_editor	2020-07-21 17:39:49 +03:00
Ivan MikheykinandGitHub	b96d205787	Merge pull request #117 from flant/dependabot/npm_and_yarn/lodash-4.17.19 build(deps): bump lodash from 4.17.15 to 4.17.19	2020-07-21 17:38:08 +03:00
dependabot[bot]andGitHub	bd30626721	build(deps): bump lodash from 4.17.15 to 4.17.19 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.19) Signed-off-by: dependabot[bot] <support@github.com>	2020-07-18 23:34:30 +00:00