diff --git a/src/app/app.js b/src/app/app.js index 901208ccc24..d0b27fcfef4 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -18,7 +18,7 @@ function (angular, $, _, appLevelRequire, config) { "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 // go back and allow it to define new features later. Once we boot, this will be false pre_boot_modules = [], @@ -64,14 +64,14 @@ function (angular, $, _, appLevelRequire, config) { '$strap.directives', 'ngSanitize', 'ngDragDrop', - 'kibana', + 'grafana', 'pasvaz.bindonce' ]; var module_types = ['controllers', 'directives', 'factories', 'services', 'filters', 'routes']; _.each(module_types, function (type) { - var module_name = 'kibana.'+type; + var module_name = 'grafana.'+type; // create the module app.useModule(angular.module(module_name, [])); // push it into the apps dependencies diff --git a/src/app/controllers/dash.js b/src/app/controllers/dash.js index 2381a73c90d..11bd9c66cf0 100644 --- a/src/app/controllers/dash.js +++ b/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([ 'angular', 'jquery', @@ -27,7 +8,7 @@ define([ function (angular, $, config, _) { "use strict"; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('DashCtrl', function( $scope, $rootScope, dashboardKeybindings, filterSrv, dashboard, panelMoveSrv, timer) { diff --git a/src/app/controllers/dashLoader.js b/src/app/controllers/dashLoader.js index 87f9aa4454e..e782dd3ddb8 100644 --- a/src/app/controllers/dashLoader.js +++ b/src/app/controllers/dashLoader.js @@ -7,7 +7,7 @@ define([ function (angular, _, moment) { '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) { diff --git a/src/app/controllers/grafanaCtrl.js b/src/app/controllers/grafanaCtrl.js index 17a2beba798..82b0ea09b19 100644 --- a/src/app/controllers/grafanaCtrl.js +++ b/src/app/controllers/grafanaCtrl.js @@ -6,7 +6,7 @@ define([ function (angular, config, _) { "use strict"; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('GrafanaCtrl', function($scope, alertSrv, grafanaVersion, $rootScope) { diff --git a/src/app/controllers/graphiteImport.js b/src/app/controllers/graphiteImport.js index 5cdd0e086c5..de30ef64711 100644 --- a/src/app/controllers/graphiteImport.js +++ b/src/app/controllers/graphiteImport.js @@ -6,7 +6,7 @@ define([ function (angular, app, _) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('GraphiteImportCtrl', function($scope, $rootScope, $timeout, datasourceSrv) { diff --git a/src/app/controllers/graphiteTarget.js b/src/app/controllers/graphiteTarget.js index 411412d4b11..681b23e7d05 100644 --- a/src/app/controllers/graphiteTarget.js +++ b/src/app/controllers/graphiteTarget.js @@ -8,7 +8,7 @@ define([ function (angular, _, config, gfunc, Parser) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('GraphiteTargetCtrl', function($scope) { diff --git a/src/app/controllers/influxTargetCtrl.js b/src/app/controllers/influxTargetCtrl.js index b0693a85ccf..bb34df8f608 100644 --- a/src/app/controllers/influxTargetCtrl.js +++ b/src/app/controllers/influxTargetCtrl.js @@ -4,7 +4,7 @@ define([ function (angular) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); var seriesList = null; diff --git a/src/app/controllers/inspectCtrl.js b/src/app/controllers/inspectCtrl.js index fd276eecbd8..e9a98506dab 100644 --- a/src/app/controllers/inspectCtrl.js +++ b/src/app/controllers/inspectCtrl.js @@ -4,7 +4,7 @@ define([ function (angular) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('InspectCtrl', function($scope) { var model = $scope.inspector; @@ -47,7 +47,7 @@ function (angular) { }); angular - .module('kibana.directives') + .module('grafana.directives') .directive('iframeContent', function($parse) { return { restrict: 'A', diff --git a/src/app/controllers/metricKeys.js b/src/app/controllers/metricKeys.js index 61ac85cfed2..375b2c19370 100644 --- a/src/app/controllers/metricKeys.js +++ b/src/app/controllers/metricKeys.js @@ -6,7 +6,7 @@ define([ function (angular, _, config) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('MetricKeysCtrl', function($scope, $http, $q) { var elasticSearchUrlForMetricIndex = config.elasticsearch + '/' + config.grafana_metrics_index + '/'; diff --git a/src/app/controllers/opentsdbTargetCtrl.js b/src/app/controllers/opentsdbTargetCtrl.js index b10cf385ac1..b69aa03d3b9 100644 --- a/src/app/controllers/opentsdbTargetCtrl.js +++ b/src/app/controllers/opentsdbTargetCtrl.js @@ -6,7 +6,7 @@ define([ function (angular, _, kbn) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('OpenTSDBTargetCtrl', function($scope, $timeout) { diff --git a/src/app/controllers/playlistCtrl.js b/src/app/controllers/playlistCtrl.js index 249099e5103..eb951d97cba 100644 --- a/src/app/controllers/playlistCtrl.js +++ b/src/app/controllers/playlistCtrl.js @@ -6,7 +6,7 @@ define([ function (angular, _, config) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('PlaylistCtrl', function($scope, playlistSrv) { diff --git a/src/app/controllers/pulldown.js b/src/app/controllers/pulldown.js index 425f7c2813c..dcc0d7be115 100644 --- a/src/app/controllers/pulldown.js +++ b/src/app/controllers/pulldown.js @@ -6,7 +6,7 @@ define([ function (angular, app, _) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('PulldownCtrl', function($scope, $rootScope, $timeout) { var _d = { diff --git a/src/app/controllers/row.js b/src/app/controllers/row.js index 3b66aa9741c..279116a92e6 100644 --- a/src/app/controllers/row.js +++ b/src/app/controllers/row.js @@ -6,7 +6,7 @@ define([ function (angular, app, _) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('RowCtrl', function($scope, $rootScope, $timeout) { var _d = { @@ -136,12 +136,12 @@ function (angular, app, _) { * * [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 * multiple queries as a visualization. Other panels may show collections of documents or * 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 * section. You may find settings here which are not exposed via the web interface. * diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index 9f9d66424d3..f88e9e0c079 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -7,7 +7,7 @@ define([ function (angular, _, config, $) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('SearchCtrl', function($scope, $rootScope, $element, $location, elastic) { diff --git a/src/app/controllers/submenuCtrl.js b/src/app/controllers/submenuCtrl.js index 6781ef63da7..f06a479f16d 100644 --- a/src/app/controllers/submenuCtrl.js +++ b/src/app/controllers/submenuCtrl.js @@ -6,7 +6,7 @@ define([ function (angular, app, _) { 'use strict'; - var module = angular.module('kibana.controllers'); + var module = angular.module('grafana.controllers'); module.controller('SubmenuCtrl', function($scope) { var _d = { diff --git a/src/app/directives/addGraphiteFunc.js b/src/app/directives/addGraphiteFunc.js index e137a770b03..a623d29e180 100644 --- a/src/app/directives/addGraphiteFunc.js +++ b/src/app/directives/addGraphiteFunc.js @@ -9,7 +9,7 @@ function (angular, app, _, $, gfunc) { 'use strict'; angular - .module('kibana.directives') + .module('grafana.directives') .directive('graphiteAddFunc', function($compile) { var inputTemplate = ''+ ' loading ...' + diff --git a/src/app/directives/grafanaVersionCheck.js b/src/app/directives/grafanaVersionCheck.js index 0981b68066a..6f89b699b4c 100644 --- a/src/app/directives/grafanaVersionCheck.js +++ b/src/app/directives/grafanaVersionCheck.js @@ -5,7 +5,7 @@ function (angular) { 'use strict'; angular - .module('kibana.directives') + .module('grafana.directives') .directive('grafanaVersionCheck', function($http, grafanaVersion) { return { restrict: 'A', diff --git a/src/app/directives/graphiteFuncEditor.js b/src/app/directives/graphiteFuncEditor.js index b2a3f4523b1..438da6d7ffa 100644 --- a/src/app/directives/graphiteFuncEditor.js +++ b/src/app/directives/graphiteFuncEditor.js @@ -7,7 +7,7 @@ function (angular, _, $) { 'use strict'; angular - .module('kibana.directives') + .module('grafana.directives') .directive('graphiteFuncEditor', function($compile) { var funcSpanTemplate = '{{func.def.name}}('; diff --git a/src/app/directives/influxdbFuncEditor.js b/src/app/directives/influxdbFuncEditor.js index 4633ac30428..371f15b9ed7 100644 --- a/src/app/directives/influxdbFuncEditor.js +++ b/src/app/directives/influxdbFuncEditor.js @@ -7,7 +7,7 @@ function (angular, _, $) { 'use strict'; angular - .module('kibana.directives') + .module('grafana.directives') .directive('influxdbFuncEditor', function($compile) { var funcSpanTemplate = ' -
  • +