Merge branch 'master' of https://github.com/grafana/grafana into ds-conf-box

examples/nginx-app/.gitignore

+.DS_Store
+
+node_modules
+tmp/*
+npm-debug.log
+dist/*
+

examples/nginx-app/.jscs.json

+{
+    "disallowImplicitTypeConversion": ["string"],
+    "disallowKeywords": ["with"],
+    "disallowMultipleLineBreaks": true,
+    "disallowMixedSpacesAndTabs": true,
+    "disallowTrailingWhitespace": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "disallowSpacesInsideArrayBrackets": true,
+    "disallowSpacesInsideParentheses": true,
+    "validateIndentation": 2
+}
\ No newline at end of file

examples/nginx-app/.jshintrc

+{
+  "browser": true,
+  "esnext": true,
+
+  "bitwise":false,
+  "curly": true,
+  "eqnull": true,
+  "devel": true,
+  "eqeqeq": true,
+  "forin": false,
+  "immed": true,
+  "supernew": true,
+  "expr": true,
+  "indent": 2,
+  "latedef": true,
+  "newcap": true,
+  "noarg": true,
+  "noempty": true,
+  "undef": true,
+  "boss": true,
+  "trailing": true,
+  "laxbreak": true,
+  "laxcomma": true,
+  "sub": true,
+  "unused": true,
+  "maxdepth": 6,
+  "maxlen": 140,
+
+  "globals": {
+    "System": true,
+    "define": true,
+    "require": true,
+    "Chromath": false,
+    "setImmediate": true
+  }
+}

examples/nginx-app/Gruntfile.js

+module.exports = function(grunt) {
+
+  require('load-grunt-tasks')(grunt);
+
+  grunt.loadNpmTasks('grunt-execute');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  grunt.initConfig({
+
+    clean: ["dist"],
+
+    copy: {
+      src_to_dist: {
+        cwd: 'src',
+        expand: true,
+        src: ['**/*', '!**/*.js', '!**/*.scss'],
+        dest: 'dist'
+      },
+      pluginDef: {
+        expand: true,
+        src: 'plugin.json',
+        dest: 'dist',
+      }
+    },
+
+    watch: {
+      rebuild_all: {
+        files: ['src/**/*', 'plugin.json'],
+        tasks: ['default'],
+        options: {spawn: false}
+      },
+    },
+
+    babel: {
+      options: {
+        sourceMap: true,
+        presets:  ["es2015"],
+        plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
+      },
+      dist: {
+        files: [{
+          cwd: 'src',
+          expand: true,
+          src: ['**/*.js'],
+          dest: 'dist',
+          ext:'.js'
+        }]
+      },
+    },
+
+  });
+
+  grunt.registerTask('default', ['clean', 'copy:src_to_dist', 'copy:pluginDef', 'babel']);
+};

examples/nginx-app/module.js

-define([
-], function()  {
-  'use strict';
-
-  function StreamPageCtrl() {}
-  StreamPageCtrl.templateUrl = 'partials/stream.html';
-
-  function LogsPageCtrl() {}
-  LogsPageCtrl.templateUrl = 'partials/logs.html';
-
-  function NginxConfigCtrl() {}
-  NginxConfigCtrl.templateUrl = 'partials/config.html';
-
-  return {
-    ConfigCtrl: NginxConfigCtrl,
-    StreamPageCtrl: StreamPageCtrl,
-    LogsPageCtrl: LogsPageCtrl,
-  };
-
-});

examples/nginx-app/package.json

+{
+  "name": "kentik-app",
+  "private": true,
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/raintank/kentik-app-poc.git"
+  },
+  "author": "",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/raintank/kentik-app-poc/issues"
+  },
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "babel": "~6.5.1",
+    "grunt-babel": "~6.0.0",
+    "grunt-contrib-copy": "~0.8.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-contrib-uglify": "~0.11.0",
+    "grunt-systemjs-builder": "^0.2.5",
+    "load-grunt-tasks": "~3.2.0",
+    "grunt-execute": "~0.2.2",
+    "grunt-contrib-clean": "~0.6.0"
+  },
+  "dependencies": {
+    "babel-plugin-transform-es2015-modules-systemjs": "^6.5.0",
+    "babel-preset-es2015": "^6.5.0",
+    "lodash": "~4.0.0"
+  },
+  "homepage": "https://github.com/raintank/kentik-app-poc#readme"
+}

examples/nginx-app/panel/module.js

-define([
-  'app/plugins/sdk'
-], function(sdk) {
-  'use strict';
-
-  var NginxPanel = (function(_super) {
-    function NginxPanel($scope, $injector) {
-      _super.call(this, $scope, $injector);
-    }
-
-    NginxPanel.template = '<h2>nginx!</h2>';
-    NginxPanel.prototype = Object.create(_super.prototype);
-    NginxPanel.prototype.constructor = NginxPanel;
-
-    return NginxPanel;
-  })(sdk.PanelCtrl);
-
-  return {
-    PanelCtrl: NginxPanel
-  };
-});

examples/nginx-app/partials/config.html

-<h2>nginx config</h2>

examples/nginx-app/partials/logs.html

-
-Logs!

examples/nginx-app/partials/stream.html

-streams!

examples/nginx-app/src/components/config.html

+<h3>
+	Nginx config!
+</h3>

examples/nginx-app/src/components/config.js

+
+export class NginxAppConfigCtrl {
+}
+NginxAppConfigCtrl.templateUrl = 'components/config.html';
+
+

examples/nginx-app/src/components/logs.html

+<h3>
+	Logs page!
+</h3>

examples/nginx-app/src/components/logs.js

+
+export class LogsPageCtrl {
+}
+LogsPageCtrl.templateUrl = 'components/logs.html';
+
+

examples/nginx-app/src/components/stream.html

+<h3>
+	Stream page!
+</h3>

examples/nginx-app/src/components/stream.js

+
+export class StreamPageCtrl {
+}
+StreamPageCtrl.templateUrl = 'components/stream.html';
+
+

examples/nginx-app/src/dashboards/dashboard.js

+require([
+], function () {
+
+  function Dashboard() {
+
+    this.getInputs = function() {
+
+    };
+
+    this.buildDashboard = function() {
+
+    };
+  }
+
+  return Dashboard;
+});
+

examples/nginx-app/src/module.js

+import {LogsPageCtrl} from './components/logs';
+import {StreamPageCtrl} from './components/stream';
+import {NginxAppConfigCtrl} from './components/config';
+
+export {
+  NginxAppConfigCtrl as ConfigCtrl,
+  StreamPageCtrl,
+  LogsPageCtrl
+};

examples/nginx-app/src/panel/module.js

+import {PanelCtrl} from  'app/plugins/sdk';
+
+class NginxPanelCtrl extends PanelCtrl {
+
+  constructor($scope, $injector) {
+    super($scope, $injector);
+  }
+
+}
+NginxPanelCtrl.template = '<h2>nginx!</h2>';
+
+export {
+  NginxPanelCtrl as PanelCtrl
+};
+

public/app/features/panel/panel_directive.ts

@@ -32,7 +32,7 @@ var panelTemplate = `
       <div class="gf-box-header">
       <div class="gf-box-header">
         <div class="gf-box-title">
         <div class="gf-box-title">
           <i ng-class="ctrl.icon"></i>
           <i ng-class="ctrl.icon"></i>
-          {{ctrl.name}}
+          {{ctrl.pluginName}}
         </div>
         </div>
 
 
         <div ng-model="ctrl.editorTabIndex" bs-tabs>
         <div ng-model="ctrl.editorTabIndex" bs-tabs>

public/app/features/panel/partials/soloPanel.html

@@ -2,8 +2,8 @@
 	<div class="row-fluid">
 	<div class="row-fluid">
 		<div class="span12">
 		<div class="span12">
 			<div class="panel nospace" ng-if="panel" style="width: 100%">
 			<div class="panel nospace" ng-if="panel" style="width: 100%">
-				<panel-loader dashboard="dashboard" row="row" panel="panel">
-				</panel-loader>
+				<plugin-component type="panel">
+				</plugin-component>
 			</div>
 			</div>
 		</div>
 		</div>
 </div>
 </div>

public/app/partials/signup_step2.html

@@ -6,7 +6,7 @@
 	<div class="login-box">
 	<div class="login-box">
 
 
 		<div class="login-box-logo">
 		<div class="login-box-logo">
-			<img src="img/logo_transparent_200x75.png">
+			<img src="public/img/logo_transparent_200x75.png">
 		</div>
 		</div>
 
 
     <div class="invite-box">
     <div class="invite-box">

public/app/plugins/datasource/graphite/add_graphite_func.js

@@ -99,7 +99,7 @@ function (angular, _, $, gfunc) {
         submenu: _.map(list, function(value) {
         submenu: _.map(list, function(value) {
           return {
           return {
             text: value.name,
             text: value.name,
-            click: "addFunction('" + value.name + "')",
+            click: "ctrl.addFunction('" + value.name + "')",
           };
           };
         })
         })
       };
       };