Просмотр исходного кода

Changed all kibana words to grafana

Torkel Ödegaard 11 лет назад
Родитель
Сommit
77bfd85e9e
74 измененных файлов с 91 добавлено и 110 удалено
  1. 3 3
      src/app/app.js
  2. 1 20
      src/app/controllers/dash.js
  3. 1 1
      src/app/controllers/dashLoader.js
  4. 1 1
      src/app/controllers/grafanaCtrl.js
  5. 1 1
      src/app/controllers/graphiteImport.js
  6. 1 1
      src/app/controllers/graphiteTarget.js
  7. 1 1
      src/app/controllers/influxTargetCtrl.js
  8. 2 2
      src/app/controllers/inspectCtrl.js
  9. 1 1
      src/app/controllers/metricKeys.js
  10. 1 1
      src/app/controllers/opentsdbTargetCtrl.js
  11. 1 1
      src/app/controllers/playlistCtrl.js
  12. 1 1
      src/app/controllers/pulldown.js
  13. 3 3
      src/app/controllers/row.js
  14. 1 1
      src/app/controllers/search.js
  15. 1 1
      src/app/controllers/submenuCtrl.js
  16. 1 1
      src/app/directives/addGraphiteFunc.js
  17. 1 1
      src/app/directives/addPanel.js
  18. 2 2
      src/app/directives/all.js
  19. 1 1
      src/app/directives/arrayJoin.js
  20. 1 1
      src/app/directives/bodyClass.js
  21. 2 2
      src/app/directives/bootstrap-tagsinput.js
  22. 1 1
      src/app/directives/configModal.js
  23. 1 1
      src/app/directives/confirmClick.js
  24. 1 1
      src/app/directives/dashUpload.js
  25. 2 2
      src/app/directives/grafanaGraph.js
  26. 2 2
      src/app/directives/grafanaPanel.js
  27. 2 2
      src/app/directives/grafanaSimplePanel.js
  28. 1 1
      src/app/directives/grafanaVersionCheck.js
  29. 1 1
      src/app/directives/graphiteFuncEditor.js
  30. 1 1
      src/app/directives/influxdbFuncEditor.js
  31. 1 1
      src/app/directives/ngBlur.js
  32. 1 1
      src/app/directives/ngModelOnBlur.js
  33. 1 1
      src/app/directives/spectrumPicker.js
  34. 1 1
      src/app/directives/tip.js
  35. 1 1
      src/app/filters/all.js
  36. 1 1
      src/app/panels/annotations/editor.js
  37. 1 1
      src/app/panels/annotations/module.js
  38. 1 1
      src/app/panels/filtering/module.js
  39. 1 1
      src/app/panels/graph/module.js
  40. 1 1
      src/app/panels/text/module.js
  41. 1 1
      src/app/panels/timepicker/module.js
  42. 1 1
      src/app/partials/dashLoader.html
  43. 3 3
      src/app/partials/dashboard.html
  44. 1 1
      src/app/routes/dashboard-default.js
  45. 1 1
      src/app/routes/dashboard-from-es.js
  46. 1 1
      src/app/routes/dashboard-from-file.js
  47. 1 1
      src/app/routes/dashboard-from-script.js
  48. 1 1
      src/app/services/alertSrv.js
  49. 1 1
      src/app/services/annotationsSrv.js
  50. 1 1
      src/app/services/dashboard/dashboardKeyBindings.js
  51. 1 1
      src/app/services/dashboard/dashboardModel.js
  52. 1 1
      src/app/services/datasourceSrv.js
  53. 1 1
      src/app/services/elasticsearch/es-client.js
  54. 1 1
      src/app/services/filterSrv.js
  55. 1 1
      src/app/services/graphite/graphiteDatasource.js
  56. 1 1
      src/app/services/influxdb/influxdbDatasource.js
  57. 1 1
      src/app/services/keyboardManager.js
  58. 1 1
      src/app/services/opentsdb/opentsdbDatasource.js
  59. 1 1
      src/app/services/panelMove.js
  60. 1 1
      src/app/services/playlistSrv.js
  61. 1 1
      src/app/services/timer.js
  62. 1 1
      src/app/services/unsavedChangesSrv.js
  63. 0 0
      src/css/bootstrap.dark.min.css
  64. 0 0
      src/css/bootstrap.light.min.css
  65. 0 0
      src/css/default.min.css
  66. 1 1
      src/css/less/grafana.less
  67. 4 4
      src/css/less/overrides.less
  68. 2 2
      src/css/less/variables.dark.less
  69. 2 2
      src/css/less/variables.light.less
  70. 1 1
      src/test/specs/filterSrv-specs.js
  71. 1 1
      src/test/specs/graph-panel-controller-specs.js
  72. 1 1
      src/test/specs/graphiteTargetCtrl-specs.js
  73. 4 4
      src/test/test-main.js
  74. 1 1
      tasks/options/ngtemplates.js

+ 3 - 3
src/app/app.js

@@ -18,7 +18,7 @@ function (angular, $, _, appLevelRequire, config) {
 
 
   "use strict";
   "use strict";
 
 
-  var app = angular.module('kibana', []),
+  var app = angular.module('grafana', []),
     // we will keep a reference to each module defined before boot, so that we can
     // we will keep a reference to each module defined before boot, so that we can
     // go back and allow it to define new features later. Once we boot, this will be false
     // go back and allow it to define new features later. Once we boot, this will be false
     pre_boot_modules = [],
     pre_boot_modules = [],
@@ -64,14 +64,14 @@ function (angular, $, _, appLevelRequire, config) {
     '$strap.directives',
     '$strap.directives',
     'ngSanitize',
     'ngSanitize',
     'ngDragDrop',
     'ngDragDrop',
-    'kibana',
+    'grafana',
     'pasvaz.bindonce'
     'pasvaz.bindonce'
   ];
   ];
 
 
   var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes'];
   var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes'];
 
 
   _.each(module_types, function (type) {
   _.each(module_types, function (type) {
-    var module_name = 'kibana.'+type;
+    var module_name = 'grafana.'+type;
     // create the module
     // create the module
     app.useModule(angular.module(module_name, []));
     app.useModule(angular.module(module_name, []));
     // push it into the apps dependencies
     // push it into the apps dependencies

+ 1 - 20
src/app/controllers/dash.js

@@ -1,22 +1,3 @@
-/** @scratch /index/0
- * = Kibana
- *
- * // Why can't I have a preamble here?
- *
- * == Introduction
- *
- * Kibana is an open source (Apache Licensed), browser based analytics and search dashboard for
- * ElasticSearch. Kibana is a snap to setup and start using. Written entirely in HTML and Javascript
- * it requires only a plain webserver, Kibana requires no fancy server side components.
- * Kibana strives to be easy to get started with, while also being flexible and powerful, just like
- * Elasticsearch.
- *
- * include::configuration/config.js.asciidoc[]
- *
- * include::panels.asciidoc[]
- *
- */
-
 define([
 define([
   'angular',
   'angular',
   'jquery',
   'jquery',
@@ -27,7 +8,7 @@ define([
 function (angular, $, config, _) {
 function (angular, $, config, _) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('DashCtrl', function(
   module.controller('DashCtrl', function(
     $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {
     $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) {

+ 1 - 1
src/app/controllers/dashLoader.js

@@ -7,7 +7,7 @@ define([
 function (angular, _, moment) {
 function (angular, _, moment) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('dashLoader', function($scope, $rootScope, $http, alertSrv, $location, playlistSrv, elastic) {
   module.controller('dashLoader', function($scope, $rootScope, $http, alertSrv, $location, playlistSrv, elastic) {
 
 

+ 1 - 1
src/app/controllers/grafanaCtrl.js

@@ -6,7 +6,7 @@ define([
 function (angular, config, _) {
 function (angular, config, _) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('GrafanaCtrl', function($scope, alertSrv, grafanaVersion, $rootScope) {
   module.controller('GrafanaCtrl', function($scope, alertSrv, grafanaVersion, $rootScope) {
 
 

+ 1 - 1
src/app/controllers/graphiteImport.js

@@ -6,7 +6,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('GraphiteImportCtrl', function($scope, $rootScope, $timeout, datasourceSrv) {
   module.controller('GraphiteImportCtrl', function($scope, $rootScope, $timeout, datasourceSrv) {
 
 

+ 1 - 1
src/app/controllers/graphiteTarget.js

@@ -8,7 +8,7 @@ define([
 function (angular, _, config, gfunc, Parser) {
 function (angular, _, config, gfunc, Parser) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('GraphiteTargetCtrl', function($scope) {
   module.controller('GraphiteTargetCtrl', function($scope) {
 
 

+ 1 - 1
src/app/controllers/influxTargetCtrl.js

@@ -4,7 +4,7 @@ define([
 function (angular) {
 function (angular) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   var seriesList = null;
   var seriesList = null;
 
 

+ 2 - 2
src/app/controllers/inspectCtrl.js

@@ -4,7 +4,7 @@ define([
 function (angular) {
 function (angular) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('InspectCtrl', function($scope) {
   module.controller('InspectCtrl', function($scope) {
     var model = $scope.inspector;
     var model = $scope.inspector;
@@ -47,7 +47,7 @@ function (angular) {
   });
   });
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('iframeContent', function($parse) {
     .directive('iframeContent', function($parse) {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 1 - 1
src/app/controllers/metricKeys.js

@@ -6,7 +6,7 @@ define([
 function (angular, _, config) {
 function (angular, _, config) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('MetricKeysCtrl', function($scope, $http, $q) {
   module.controller('MetricKeysCtrl', function($scope, $http, $q) {
     var elasticSearchUrlForMetricIndex = config.elasticsearch + '/' + config.grafana_metrics_index + '/';
     var elasticSearchUrlForMetricIndex = config.elasticsearch + '/' + config.grafana_metrics_index + '/';

+ 1 - 1
src/app/controllers/opentsdbTargetCtrl.js

@@ -6,7 +6,7 @@ define([
 function (angular, _, kbn) {
 function (angular, _, kbn) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('OpenTSDBTargetCtrl', function($scope, $timeout) {
   module.controller('OpenTSDBTargetCtrl', function($scope, $timeout) {
 
 

+ 1 - 1
src/app/controllers/playlistCtrl.js

@@ -6,7 +6,7 @@ define([
 function (angular, _, config) {
 function (angular, _, config) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('PlaylistCtrl', function($scope, playlistSrv) {
   module.controller('PlaylistCtrl', function($scope, playlistSrv) {
 
 

+ 1 - 1
src/app/controllers/pulldown.js

@@ -6,7 +6,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('PulldownCtrl', function($scope, $rootScope, $timeout) {
   module.controller('PulldownCtrl', function($scope, $rootScope, $timeout) {
     var _d = {
     var _d = {

+ 3 - 3
src/app/controllers/row.js

@@ -6,7 +6,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('RowCtrl', function($scope, $rootScope, $timeout) {
   module.controller('RowCtrl', function($scope, $rootScope, $timeout) {
     var _d = {
     var _d = {
@@ -136,12 +136,12 @@ function (angular, app, _) {
      *
      *
      * [partintro]
      * [partintro]
      * --
      * --
-     * *Kibana* dashboards are made up of blocks called +panels+. Panels are organized into rows
+     * *grafana* dashboards are made up of blocks called +panels+. Panels are organized into rows
      * and can serve many purposes, though most are designed to provide the results of a query or
      * and can serve many purposes, though most are designed to provide the results of a query or
      * multiple queries as a visualization. Other panels may show collections of documents or
      * multiple queries as a visualization. Other panels may show collections of documents or
      * allow you to insert instructions for your users.
      * allow you to insert instructions for your users.
      *
      *
-     * Panels can be configured easily via the Kibana web interface. For more advanced usage, such
+     * Panels can be configured easily via the grafana web interface. For more advanced usage, such
      * as templated or scripted dashboards, documentation of panel properties is available in this
      * as templated or scripted dashboards, documentation of panel properties is available in this
      * section. You may find settings here which are not exposed via the web interface.
      * section. You may find settings here which are not exposed via the web interface.
      *
      *

+ 1 - 1
src/app/controllers/search.js

@@ -7,7 +7,7 @@ define([
 function (angular, _, config, $) {
 function (angular, _, config, $) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('SearchCtrl', function($scope, $rootScope, $element, $location, elastic) {
   module.controller('SearchCtrl', function($scope, $rootScope, $element, $location, elastic) {
 
 

+ 1 - 1
src/app/controllers/submenuCtrl.js

@@ -6,7 +6,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.controllers');
+  var module = angular.module('grafana.controllers');
 
 
   module.controller('SubmenuCtrl', function($scope) {
   module.controller('SubmenuCtrl', function($scope) {
     var _d = {
     var _d = {

+ 1 - 1
src/app/directives/addGraphiteFunc.js

@@ -9,7 +9,7 @@ function (angular, app, _, $, gfunc) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('graphiteAddFunc', function($compile) {
     .directive('graphiteAddFunc', function($compile) {
       var inputTemplate = '<input type="text"'+
       var inputTemplate = '<input type="text"'+
                             ' class="grafana-target-segment-input input-medium grafana-target-segment-input"' +
                             ' class="grafana-target-segment-input input-medium grafana-target-segment-input"' +

+ 1 - 1
src/app/directives/addPanel.js

@@ -7,7 +7,7 @@ function (angular, app, _) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('addPanel', function($compile) {
     .directive('addPanel', function($compile) {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 2 - 2
src/app/directives/all.js

@@ -2,8 +2,8 @@ define([
   './addPanel',
   './addPanel',
   './arrayJoin',
   './arrayJoin',
   './dashUpload',
   './dashUpload',
-  './kibanaPanel',
-  './kibanaSimplePanel',
+  './grafanaPanel',
+  './grafanaSimplePanel',
   './ngBlur',
   './ngBlur',
   './ngModelOnBlur',
   './ngModelOnBlur',
   './tip',
   './tip',

+ 1 - 1
src/app/directives/arrayJoin.js

@@ -7,7 +7,7 @@ function (angular, app, _) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('arrayJoin', function() {
     .directive('arrayJoin', function() {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 1 - 1
src/app/directives/bodyClass.js

@@ -7,7 +7,7 @@ function (angular, app, _) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('bodyClass', function() {
     .directive('bodyClass', function() {
       return {
       return {
         link: function($scope, elem) {
         link: function($scope, elem) {

+ 2 - 2
src/app/directives/bootstrap-tagsinput.js

@@ -7,7 +7,7 @@ function (angular, $) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('bootstrapTagsinput', function() {
     .directive('bootstrapTagsinput', function() {
 
 
       function getItemProperty(scope, property) {
       function getItemProperty(scope, property) {
@@ -84,7 +84,7 @@ function (angular, $) {
     });
     });
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('gfDropdown', function ($parse, $compile, $timeout) {
     .directive('gfDropdown', function ($parse, $compile, $timeout) {
 
 
       function buildTemplate(items, placement) {
       function buildTemplate(items, placement) {

+ 1 - 1
src/app/directives/configModal.js

@@ -7,7 +7,7 @@ function (angular, _, $) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('configModal', function($modal, $q, $timeout) {
     .directive('configModal', function($modal, $q, $timeout) {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 1 - 1
src/app/directives/confirmClick.js

@@ -5,7 +5,7 @@ define([
 function (angular) {
 function (angular) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.directives');
+  var module = angular.module('grafana.directives');
 
 
   module.directive('confirmClick', function() {
   module.directive('confirmClick', function() {
     return {
     return {

+ 1 - 1
src/app/directives/dashUpload.js

@@ -4,7 +4,7 @@ define([
 function (angular) {
 function (angular) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.directives');
+  var module = angular.module('grafana.directives');
 
 
   module.directive('dashUpload', function(timer, alertSrv) {
   module.directive('dashUpload', function(timer, alertSrv) {
     return {
     return {

+ 2 - 2
src/app/directives/grafanaGraph.js

@@ -8,7 +8,7 @@ define([
 function (angular, $, kbn, moment, _) {
 function (angular, $, kbn, moment, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.directives');
+  var module = angular.module('grafana.directives');
 
 
   module.directive('grafanaGraph', function($rootScope) {
   module.directive('grafanaGraph', function($rootScope) {
     return {
     return {
@@ -371,7 +371,7 @@ function (angular, $, kbn, moment, _) {
         function render_panel_as_graphite_png(url) {
         function render_panel_as_graphite_png(url) {
           url += '&width=' + elem.width();
           url += '&width=' + elem.width();
           url += '&height=' + elem.css('height').replace('px', '');
           url += '&height=' + elem.css('height').replace('px', '');
-          url += '&bgcolor=1f1f1f'; // @grayDarker & @kibanaPanelBackground
+          url += '&bgcolor=1f1f1f'; // @grayDarker & @grafanaPanelBackground
           url += '&fgcolor=BBBFC2'; // @textColor & @grayLighter
           url += '&fgcolor=BBBFC2'; // @textColor & @grayLighter
           url += scope.panel.stack ? '&areaMode=stacked' : '';
           url += scope.panel.stack ? '&areaMode=stacked' : '';
           url += scope.panel.fill !== 0 ? ('&areaAlpha=' + (scope.panel.fill/10).toFixed(1)) : '';
           url += scope.panel.fill !== 0 ? ('&areaAlpha=' + (scope.panel.fill/10).toFixed(1)) : '';

+ 2 - 2
src/app/directives/kibanaPanel.js → src/app/directives/grafanaPanel.js

@@ -8,8 +8,8 @@ function (angular, $, _, PanelBaseCtrl) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
-    .directive('kibanaPanel', function($compile, $timeout, $rootScope, $injector) {
+    .module('grafana.directives')
+    .directive('grafanaPanel', function($compile, $timeout, $rootScope, $injector) {
 
 
       var container = '<div class="panel-container"></div>';
       var container = '<div class="panel-container"></div>';
       var content = '<div class="panel-content"></div>';
       var content = '<div class="panel-content"></div>';

+ 2 - 2
src/app/directives/kibanaSimplePanel.js → src/app/directives/grafanaSimplePanel.js

@@ -6,8 +6,8 @@ function (angular, _) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
-    .directive('kibanaSimplePanel', function($compile) {
+    .module('grafana.directives')
+    .directive('grafanaSimplePanel', function($compile) {
       var panelLoading = '<span ng-show="panelMeta.loading == true">' +
       var panelLoading = '<span ng-show="panelMeta.loading == true">' +
         '<span style="font-size:72px;font-weight:200">'+
         '<span style="font-size:72px;font-weight:200">'+
           '<i class="icon-spinner icon-spin"></i> loading ...' +
           '<i class="icon-spinner icon-spin"></i> loading ...' +

+ 1 - 1
src/app/directives/grafanaVersionCheck.js

@@ -5,7 +5,7 @@ function (angular) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('grafanaVersionCheck', function($http, grafanaVersion) {
     .directive('grafanaVersionCheck', function($http, grafanaVersion) {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 1 - 1
src/app/directives/graphiteFuncEditor.js

@@ -7,7 +7,7 @@ function (angular, _, $) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('graphiteFuncEditor', function($compile) {
     .directive('graphiteFuncEditor', function($compile) {
 
 
       var funcSpanTemplate = '<a ng-click="">{{func.def.name}}</a><span>(</span>';
       var funcSpanTemplate = '<a ng-click="">{{func.def.name}}</a><span>(</span>';

+ 1 - 1
src/app/directives/influxdbFuncEditor.js

@@ -7,7 +7,7 @@ function (angular, _, $) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('influxdbFuncEditor', function($compile) {
     .directive('influxdbFuncEditor', function($compile) {
 
 
       var funcSpanTemplate = '<a gf-dropdown="functionMenu" class="dropdown-toggle" ' +
       var funcSpanTemplate = '<a gf-dropdown="functionMenu" class="dropdown-toggle" ' +

+ 1 - 1
src/app/directives/ngBlur.js

@@ -5,7 +5,7 @@ function (angular) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('ngBlur', ['$parse', function($parse) {
     .directive('ngBlur', ['$parse', function($parse) {
       return function(scope, element, attr) {
       return function(scope, element, attr) {
         var fn = $parse(attr['ngBlur']);
         var fn = $parse(attr['ngBlur']);

+ 1 - 1
src/app/directives/ngModelOnBlur.js

@@ -3,7 +3,7 @@ function (angular) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('ngModelOnblur', function() {
     .directive('ngModelOnblur', function() {
       return {
       return {
         restrict: 'A',
         restrict: 'A',

+ 1 - 1
src/app/directives/spectrumPicker.js

@@ -6,7 +6,7 @@ function (angular) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('spectrumPicker', function() {
     .directive('spectrumPicker', function() {
       return {
       return {
         restrict: 'E',
         restrict: 'E',

+ 1 - 1
src/app/directives/tip.js

@@ -6,7 +6,7 @@ function (angular, kbn) {
   'use strict';
   'use strict';
 
 
   angular
   angular
-    .module('kibana.directives')
+    .module('grafana.directives')
     .directive('tip', function($compile) {
     .directive('tip', function($compile) {
       return {
       return {
         restrict: 'E',
         restrict: 'E',

+ 1 - 1
src/app/filters/all.js

@@ -1,7 +1,7 @@
 define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
 define(['angular', 'jquery', 'underscore', 'moment'], function (angular, $, _, moment) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.filters');
+  var module = angular.module('grafana.filters');
 
 
   module.filter('stringSort', function() {
   module.filter('stringSort', function() {
     return function(input) {
     return function(input) {

+ 1 - 1
src/app/panels/annotations/editor.js

@@ -9,7 +9,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.annotations', []);
+  var module = angular.module('grafana.panels.annotations', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv, $rootScope) {
   module.controller('AnnotationsEditorCtrl', function($scope, datasourceSrv, $rootScope) {

+ 1 - 1
src/app/panels/annotations/module.js

@@ -12,7 +12,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.annotations', []);
+  var module = angular.module('grafana.panels.annotations', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('AnnotationsCtrl', function($scope, datasourceSrv, $rootScope) {
   module.controller('AnnotationsCtrl', function($scope, datasourceSrv, $rootScope) {

+ 1 - 1
src/app/panels/filtering/module.js

@@ -11,7 +11,7 @@ define([
 function (angular, app, _) {
 function (angular, app, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.filtering', []);
+  var module = angular.module('grafana.panels.filtering', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('filtering', function($scope, datasourceSrv, $rootScope, $timeout, $q) {
   module.controller('filtering', function($scope, datasourceSrv, $rootScope, $timeout, $q) {

+ 1 - 1
src/app/panels/graph/module.js

@@ -32,7 +32,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
 
 
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.graph', []);
+  var module = angular.module('grafana.panels.graph', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('graph', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {
   module.controller('graph', function($scope, $rootScope, datasourceSrv, $timeout, annotationsSrv) {

+ 1 - 1
src/app/panels/text/module.js

@@ -20,7 +20,7 @@ define([
 function (angular, app, _, require) {
 function (angular, app, _, require) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.text', []);
+  var module = angular.module('grafana.panels.text', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('text', function($scope, filterSrv) {
   module.controller('text', function($scope, filterSrv) {

+ 1 - 1
src/app/panels/timepicker/module.js

@@ -22,7 +22,7 @@ define([
 function (angular, app, _, moment, kbn) {
 function (angular, app, _, moment, kbn) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.panels.timepicker', []);
+  var module = angular.module('grafana.panels.timepicker', []);
   app.useModule(module);
   app.useModule(module);
 
 
   module.controller('timepicker', function($scope, $modal, $q) {
   module.controller('timepicker', function($scope, $modal, $q) {

+ 1 - 1
src/app/partials/dashLoader.html

@@ -16,7 +16,7 @@
   </a>
   </a>
 </li>
 </li>
 
 
-<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"><kibana-simple-panel type="pulldown.type" ng-cloak></kibana-simple-panel></li>
+<li ng-repeat="pulldown in dashboard.nav" ng-controller="PulldownCtrl" ng-show="pulldown.enable"><grafana-simple-panel type="pulldown.type" ng-cloak></grafana-simple-panel></li>
 
 
 <li class="dropdown grafana-menu-save" ng-show="showDropdown('save')">
 <li class="dropdown grafana-menu-save" ng-show="showDropdown('save')">
   <a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">
   <a href="#"  bs-tooltip="'Save'" data-placement="bottom" class="dropdown-toggle" data-toggle="dropdown" ng-click="openSaveDropdown()">

+ 3 - 3
src/app/partials/dashboard.html

@@ -16,7 +16,7 @@
         <span class="small"><strong>{{pulldown.type}}:</strong></span>
         <span class="small"><strong>{{pulldown.type}}:</strong></span>
       </div>
       </div>
       <div class="submenu-panel-wrapper">
       <div class="submenu-panel-wrapper">
-        <kibana-simple-panel type="pulldown.type" ng-cloak></kibana-simple-panel>
+        <grafana-simple-panel type="pulldown.type" ng-cloak></grafana-simple-panel>
       </div>
       </div>
     </div>
     </div>
     <div class="clearfix"></div>
     <div class="clearfix"></div>
@@ -27,7 +27,7 @@
     <div>
     <div>
       <div class="grafana-container container">
       <div class="grafana-container container">
         <!-- Rows -->
         <!-- Rows -->
-        <div class="kibana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" ng-style="row_style(row)">
+        <div class="grafana-row" ng-controller="RowCtrl" ng-repeat="(row_name, row) in dashboard.rows" ng-style="row_style(row)">
           <div class="row-control">
           <div class="row-control">
             <div class="grafana-row" style="padding:0px;margin:0px;position:relative;">
             <div class="grafana-row" style="padding:0px;margin:0px;position:relative;">
               <div class="row-close" ng-show="row.collapse" data-placement="bottom" >
               <div class="row-close" ng-show="row.collapse" data-placement="bottom" >
@@ -96,7 +96,7 @@
               <div ng-repeat="(name, panel) in row.panels|filter:isPanel" ng-hide="panel.hide" class="panel nospace" ng-style="{'width':!panel.span?'100%':(panel.span/1.2)*10+'%'}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}" ng-class="{'dragInProgress':dashboard.panelDragging}">
               <div ng-repeat="(name, panel) in row.panels|filter:isPanel" ng-hide="panel.hide" class="panel nospace" ng-style="{'width':!panel.span?'100%':(panel.span/1.2)*10+'%'}" data-drop="true" ng-model="row.panels" data-jqyoui-options jqyoui-droppable="{index:$index,mutate:false,onDrop:'panelMoveDrop',onOver:'panelMoveOver(true)',onOut:'panelMoveOut'}" ng-class="{'dragInProgress':dashboard.panelDragging}">
                 <!-- Content Panel -->
                 <!-- Content Panel -->
                 <div style="position:relative">
                 <div style="position:relative">
-                  <kibana-panel type="panel.type" ng-cloak></kibana-panel>
+                  <grafana-panel type="panel.type" ng-cloak></grafana-panel>
                 </div>
                 </div>
               </div>
               </div>
 
 

+ 1 - 1
src/app/routes/dashboard-default.js

@@ -5,7 +5,7 @@ define([
 function (angular, config) {
 function (angular, config) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.routes');
+  var module = angular.module('grafana.routes');
 
 
   module.config(function($routeProvider) {
   module.config(function($routeProvider) {
     $routeProvider
     $routeProvider

+ 1 - 1
src/app/routes/dashboard-from-es.js

@@ -6,7 +6,7 @@ define([
 function (angular, $, config) {
 function (angular, $, config) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.routes');
+  var module = angular.module('grafana.routes');
 
 
   module.config(function($routeProvider) {
   module.config(function($routeProvider) {
     $routeProvider
     $routeProvider

+ 1 - 1
src/app/routes/dashboard-from-file.js

@@ -7,7 +7,7 @@ define([
 function (angular, $, config, _) {
 function (angular, $, config, _) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.routes');
+  var module = angular.module('grafana.routes');
 
 
   module.config(function($routeProvider) {
   module.config(function($routeProvider) {
     $routeProvider
     $routeProvider

+ 1 - 1
src/app/routes/dashboard-from-script.js

@@ -9,7 +9,7 @@ define([
 function (angular, $, config, _, kbn, moment) {
 function (angular, $, config, _, kbn, moment) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.routes');
+  var module = angular.module('grafana.routes');
 
 
   module.config(function($routeProvider) {
   module.config(function($routeProvider) {
     $routeProvider
     $routeProvider

+ 1 - 1
src/app/services/alertSrv.js

@@ -5,7 +5,7 @@ define([
 function (angular, _) {
 function (angular, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('alertSrv', function($timeout) {
   module.service('alertSrv', function($timeout) {
     var self = this;
     var self = this;

+ 1 - 1
src/app/services/annotationsSrv.js

@@ -5,7 +5,7 @@ define([
 ], function (angular, _, moment) {
 ], function (angular, _, moment) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope) {
   module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope) {
     var promiseCached;
     var promiseCached;

+ 1 - 1
src/app/services/dashboard/dashboardKeyBindings.js

@@ -6,7 +6,7 @@ define([
 function(angular, $) {
 function(angular, $) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('dashboardKeybindings', function($rootScope, keyboardManager) {
   module.service('dashboardKeybindings', function($rootScope, keyboardManager) {
 
 

+ 1 - 1
src/app/services/dashboard/dashboardModel.js

@@ -7,7 +7,7 @@ define([
 function (angular, $, kbn, _) {
 function (angular, $, kbn, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('dashboard', function(timer, $rootScope, $timeout) {
   module.service('dashboard', function(timer, $rootScope, $timeout) {
 
 

+ 1 - 1
src/app/services/datasourceSrv.js

@@ -9,7 +9,7 @@ define([
 function (angular, _, config) {
 function (angular, _, config) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('datasourceSrv', function($q, filterSrv, $http, GraphiteDatasource, InfluxDatasource, OpenTSDBDatasource) {
   module.service('datasourceSrv', function($q, filterSrv, $http, GraphiteDatasource, InfluxDatasource, OpenTSDBDatasource) {
     var datasources = {};
     var datasources = {};

+ 1 - 1
src/app/services/elasticsearch/es-client.js

@@ -5,7 +5,7 @@ define([
 function(angular, config) {
 function(angular, config) {
   "use strict";
   "use strict";
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('elastic', function($http) {
   module.service('elastic', function($http) {
 
 

+ 1 - 1
src/app/services/filterSrv.js

@@ -6,7 +6,7 @@ define([
 ], function (angular, _, config, kbn) {
 ], function (angular, _, config, kbn) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.factory('filterSrv', function($rootScope, $timeout, $routeParams) {
   module.factory('filterSrv', function($rootScope, $timeout, $routeParams) {
     // defaults
     // defaults

+ 1 - 1
src/app/services/graphite/graphiteDatasource.js

@@ -9,7 +9,7 @@ define([
 function (angular, _, $, config, kbn, moment) {
 function (angular, _, $, config, kbn, moment) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.factory('GraphiteDatasource', function($q, $http) {
   module.factory('GraphiteDatasource', function($q, $http) {
 
 

+ 1 - 1
src/app/services/influxdb/influxdbDatasource.js

@@ -7,7 +7,7 @@ define([
 function (angular, _, kbn, InfluxSeries) {
 function (angular, _, kbn, InfluxSeries) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.factory('InfluxDatasource', function($q, $http) {
   module.factory('InfluxDatasource', function($q, $http) {
 
 

+ 1 - 1
src/app/services/keyboardManager.js

@@ -4,7 +4,7 @@ define([
 function (angular) {
 function (angular) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   // This service was based on OpenJS library available in BSD License
   // This service was based on OpenJS library available in BSD License
   // http://www.openjs.com/scripts/events/keyboard_shortcuts/index.php
   // http://www.openjs.com/scripts/events/keyboard_shortcuts/index.php

+ 1 - 1
src/app/services/opentsdb/opentsdbDatasource.js

@@ -6,7 +6,7 @@ define([
 function (angular, _, kbn) {
 function (angular, _, kbn) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.factory('OpenTSDBDatasource', function($q, $http) {
   module.factory('OpenTSDBDatasource', function($q, $http) {
 
 

+ 1 - 1
src/app/services/panelMove.js

@@ -5,7 +5,7 @@ define([
 function (angular, _) {
 function (angular, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('panelMoveSrv', function($rootScope) {
   module.service('panelMoveSrv', function($rootScope) {
 
 

+ 1 - 1
src/app/services/playlistSrv.js

@@ -6,7 +6,7 @@ define([
 function (angular, _, kbn) {
 function (angular, _, kbn) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('playlistSrv', function($location, $rootScope) {
   module.service('playlistSrv', function($location, $rootScope) {
     var timerInstance;
     var timerInstance;

+ 1 - 1
src/app/services/timer.js

@@ -5,7 +5,7 @@ define([
 function (angular, _) {
 function (angular, _) {
   'use strict';
   'use strict';
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('timer', function($timeout) {
   module.service('timer', function($timeout) {
     // This service really just tracks a list of $timeout promises to give us a
     // This service really just tracks a list of $timeout promises to give us a

+ 1 - 1
src/app/services/unsavedChangesSrv.js

@@ -10,7 +10,7 @@ function(angular, _, config) {
     return;
     return;
   }
   }
 
 
-  var module = angular.module('kibana.services');
+  var module = angular.module('grafana.services');
 
 
   module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout) {
   module.service('unsavedChangesSrv', function($rootScope, $modal, $q, $location, $timeout) {
 
 

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.dark.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/bootstrap.light.min.css


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/css/default.min.css


+ 1 - 1
src/css/less/grafana.less

@@ -133,7 +133,7 @@
   top: 54px;
   top: 54px;
   height: 100%;
   height: 100%;
   padding: 0 10px;
   padding: 0 10px;
-  background: @kibanaPanelBackground;
+  background: @grafanaPanelBackground;
   overflow-y: scroll;
   overflow-y: scroll;
   height: 100%;
   height: 100%;
 
 

+ 4 - 4
src/css/less/overrides.less

@@ -72,7 +72,7 @@ code, pre {
 
 
 .panel-container {
 .panel-container {
   padding: 0px 0px 0px 0px;
   padding: 0px 0px 0px 0px;
-  background: @kibanaPanelBackground;
+  background: @grafanaPanelBackground;
   margin: 5px;
   margin: 5px;
 }
 }
 
 
@@ -199,7 +199,7 @@ form input.ng-invalid {
   border-width: 0 0 0px;
   border-width: 0 0 0px;
 }
 }
 
 
-.kibana-row {
+.grafana-row {
   margin-bottom: 5px;
   margin-bottom: 5px;
 }
 }
 
 
@@ -241,7 +241,7 @@ form input.ng-invalid {
   margin: 0px;
   margin: 0px;
   min-height: 30px !important;
   min-height: 30px !important;
   line-height: 30px;
   line-height: 30px;
-  background: @kibanaPanelBackground;
+  background: @grafanaPanelBackground;
 }
 }
 
 
 .row-open {
 .row-open {
@@ -612,6 +612,6 @@ div.flot-text {
 
 
 // pre
 // pre
 code, pre {
 code, pre {
-  background-color: @kibanaPanelBackground;
+  background-color: @grafanaPanelBackground;
   color: @textColor;
   color: @textColor;
 }
 }

+ 2 - 2
src/css/less/variables.dark.less

@@ -25,9 +25,9 @@
 @pink:                  #FF4444;
 @pink:                  #FF4444;
 @purple:                #9933CC;
 @purple:                #9933CC;
 
 
-// Kibana Variables
+// grafana Variables
 // -------------------------
 // -------------------------
-@kibanaPanelBackground: @grayDarker;
+@grafanaPanelBackground: @grayDarker;
 
 
 // Submenu
 // Submenu
 @submenuBackground: #292929;
 @submenuBackground: #292929;

+ 2 - 2
src/css/less/variables.light.less

@@ -29,9 +29,9 @@
 @pink:                  #E671B8;
 @pink:                  #E671B8;
 @purple:                #9954BB;
 @purple:                #9954BB;
 
 
-// Kibana Variables
+// grafana Variables
 // -------------------------
 // -------------------------
-@kibanaPanelBackground: @white;
+@grafanaPanelBackground: @white;
 
 
 // Submenu
 // Submenu
 @submenuBackground:     rgb(218, 217, 217);
 @submenuBackground:     rgb(218, 217, 217);

+ 1 - 1
src/test/specs/filterSrv-specs.js

@@ -9,7 +9,7 @@ define([
     var _filterSrv;
     var _filterSrv;
     var _dashboard;
     var _dashboard;
 
 
-    beforeEach(module('kibana.services'));
+    beforeEach(module('grafana.services'));
     beforeEach(module(function(){
     beforeEach(module(function(){
       _dashboard = dashboardMock.create();
       _dashboard = dashboardMock.create();
     }));
     }));

+ 1 - 1
src/test/specs/graph-panel-controller-specs.js

@@ -6,7 +6,7 @@
   describe('Graph panel controller', function() {
   describe('Graph panel controller', function() {
     var _graphPanelCtrl;
     var _graphPanelCtrl;
 
 
-    beforeEach(module('kibana.panels.graphite'));
+    beforeEach(module('grafana.panels.graphite'));
     beforeEach(module(function($provide){
     beforeEach(module(function($provide){
       $provide.value('filterSrv',{});
       $provide.value('filterSrv',{});
     }));
     }));

+ 1 - 1
src/test/specs/graphiteTargetCtrl-specs.js

@@ -5,7 +5,7 @@ define([
   describe('graphiteTargetCtrl', function() {
   describe('graphiteTargetCtrl', function() {
     var _targetCtrl;
     var _targetCtrl;
 
 
-    beforeEach(module('kibana.services'));
+    beforeEach(module('grafana.services'));
     beforeEach(module(function($provide){
     beforeEach(module(function($provide){
       $provide.value('filterSrv',{});
       $provide.value('filterSrv',{});
     }));
     }));

+ 4 - 4
src/test/test-main.js

@@ -113,10 +113,10 @@ require([
 ], function(angular) {
 ], function(angular) {
   'use strict';
   'use strict';
 
 
-  angular.module('kibana', []);
-  angular.module('kibana.services', ['$strap.directives']);
-  angular.module('kibana.panels', []);
-  angular.module('kibana.filters', []);
+  angular.module('grafana', []);
+  angular.module('grafana.services', ['$strap.directives']);
+  angular.module('grafana.panels', []);
+  angular.module('grafana.filters', []);
 
 
   require([
   require([
     'specs/lexer-specs',
     'specs/lexer-specs',

+ 1 - 1
tasks/options/ngtemplates.js

@@ -7,7 +7,7 @@ module.exports = function(config) {
       options: {
       options: {
         bootstrap: function(module, script) {
         bootstrap: function(module, script) {
           return "define('components/partials', ['angular'], function(angular) { \n" +
           return "define('components/partials', ['angular'], function(angular) { \n" +
-            "angular.module('kibana').run(['$templateCache', function($templateCache) { \n" +
+            "angular.module('grafana').run(['$templateCache', function($templateCache) { \n" +
                 script +
                 script +
             '\n}]);' +
             '\n}]);' +
           '\n});';
           '\n});';

Некоторые файлы не были показаны из-за большого количества измененных файлов