Changed all kibana words to grafana

This commit is contained in:
Torkel Ödegaard 2014-07-28 18:11:52 +02:00
parent 272ea9fe17
commit 77bfd85e9e
74 changed files with 94 additions and 113 deletions

View File

@ -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

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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;

View File

@ -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',

View File

@ -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 + '/';

View File

@ -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) {

View File

@ -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) {

View File

@ -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 = {

View File

@ -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.
* *

View File

@ -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) {

View File

@ -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 = {

View File

@ -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"' +

View File

@ -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',

View File

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

View File

@ -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',

View File

@ -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) {

View File

@ -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) {

View File

@ -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',

View File

@ -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 {

View File

@ -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 {

View File

@ -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)) : '';

View File

@ -8,8 +8,8 @@ function (angular, $, _, PanelBaseCtrl) {
'use strict'; 'use strict';
angular angular
.module('kibana.directives') .module('grafana.directives')
.directive('kibanaPanel', function($compile, $timeout, $rootScope, $injector) { .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>';

View File

@ -6,8 +6,8 @@ function (angular, _) {
'use strict'; 'use strict';
angular angular
.module('kibana.directives') .module('grafana.directives')
.directive('kibanaSimplePanel', function($compile) { .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 ...' +

View File

@ -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',

View File

@ -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>';

View File

@ -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" ' +

View File

@ -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']);

View File

@ -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',

View File

@ -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',

View File

@ -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',

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {

View File

@ -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()">

View File

@ -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>

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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;

View File

@ -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) {

View File

@ -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) {

View File

@ -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 = {};

View File

@ -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) {

View File

@ -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

View File

@ -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) {

View File

@ -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) {

View File

@ -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

View File

@ -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) {

View File

@ -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) {

View File

@ -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;

View File

@ -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

View File

@ -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) {

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -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%;

View File

@ -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;
} }

View File

@ -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;

View File

@ -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);

View File

@ -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();
})); }));

View File

@ -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',{});
})); }));

View File

@ -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',{});
})); }));

View File

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

View File

@ -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});';