diff --git a/zabbix/datasource.js b/zabbix/datasource.js index 0afa562..239f780 100644 --- a/zabbix/datasource.js +++ b/zabbix/datasource.js @@ -2,6 +2,7 @@ define([ 'angular', 'lodash', 'kbn', + './directives', './zabbixAPIWrapper', './helperFunctions', './queryCtrl' diff --git a/zabbix/directives.js b/zabbix/directives.js new file mode 100644 index 0000000..95bb491 --- /dev/null +++ b/zabbix/directives.js @@ -0,0 +1,17 @@ +define([ + 'angular' + ], + function (angular) { + 'use strict'; + + var module = angular.module('grafana.directives'); + + module.directive('metricQueryEditorZabbix', function() { + return {controller: 'ZabbixAPIQueryCtrl', templateUrl: 'app/plugins/datasource/zabbix/partials/query.editor.html'}; + }); + + module.directive('metricQueryOptionsZabbix', function() { + return {templateUrl: 'app/plugins/datasource/zabbix/partials/query.options.html'}; + }); + + }); diff --git a/zabbix/partials/query.editor.html b/zabbix/partials/query.editor.html index 26e2ea5..fe0c059 100644 --- a/zabbix/partials/query.editor.html +++ b/zabbix/partials/query.editor.html @@ -1,318 +1,234 @@
-
+
-
-
    -
  • -
    - - - - -
      -
    • - {{targetLetters[$index]}} -
      • -
    • - - - -
      • -
    +
      +
    • + {{targetLetters[$index]}} +
      • +
    • + + + +
      • +
    - - + + - + + +
    +
    + +
    + + +
    +
    -
- -
- - -
-
- -
- -
-
-
    -
  • - -
    • -
  • - Max data points -
    • -
  • - -
    • -
-
-
-
- -
-
-
- -
-
- -
-
Max data points
-
    -
  • Grafana-Zabbix plugin uses maxDataPoints parameter to consolidate the real number of values down to this - number -
    • -
  • If there are more real values, then by default they will be consolidated using averages
    • -
  • This could hide real peaks and max values in your series
    • -
  • Point consolidation will effect series legend values (min,max,total,current)
    • -
  • If you override maxDataPoint and set a high value performance can be severely effected
    • -
-
- -
-
IT services
-

- Select "IT services" in targets menu to activate IT services mode. -

-
- -
-
IT service property
-
    -
  • Zabbix returns the following availability information about IT service
    • -
  • Status - current status of the IT service
    • -
  • SLA - SLA for the given time interval
    • -
  • OK time - time the service was in OK state, in seconds
    • -
  • Problem time - time the service was in problem state, in seconds
    • -
  • Down time - time the service was in scheduled downtime, in seconds
    • -
-
-
-
\ No newline at end of file diff --git a/zabbix/partials/query.options.html b/zabbix/partials/query.options.html new file mode 100644 index 0000000..1c020c6 --- /dev/null +++ b/zabbix/partials/query.options.html @@ -0,0 +1,83 @@ +
+
+
    +
  • + +
    • +
  • + Max data points +
    • +
  • + +
    • +
+
+
+
+ +
+
+
+ +
+
+ +
+
Max data points
+
    +
  • Grafana-Zabbix plugin uses maxDataPoints parameter to consolidate the real number of values down to this + number +
    • +
  • If there are more real values, then by default they will be consolidated using averages
    • +
  • This could hide real peaks and max values in your series
    • +
  • Point consolidation will effect series legend values (min,max,total,current)
    • +
  • If you override maxDataPoint and set a high value performance can be severely effected
    • +
+
+ +
+
IT services
+

+ Select "IT services" in targets menu to activate IT services mode. +

+
+ +
+
IT service property
+
    +
  • Zabbix returns the following availability information about IT service
    • +
  • Status - current status of the IT service
    • +
  • SLA - SLA for the given time interval
    • +
  • OK time - time the service was in OK state, in seconds
    • +
  • Problem time - time the service was in problem state, in seconds
    • +
  • Down time - time the service was in scheduled downtime, in seconds
    • +
+
+
+