IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:grafana/grafana

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-05-31 12:28:55 +02:00
commit 3f9a8ecc7e
7 changed files with 459 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package.json
View File

@ -53,5 +53,8 @@
"scripts": {
"test": "grunt test"
},
"license": "Apache License"
"license": "Apache License",
"dependencies": {
"grunt-contrib-concat": "^0.4.0"
}
}

5
src/app/controllers/influxTargetCtrl.js
View File

@ -17,7 +17,10 @@ function (angular) {
$scope.rawQuery = false;
$scope.functions = ['count', 'mean', 'sum', 'min', 'max', 'mode', 'distinct', 'median', 'derivative', 'stddev', 'first', 'last'];
$scope.functions = ['count', 'mean', 'sum', 'min',
'max', 'mode', 'distinct', 'median',
'derivative', 'stddev', 'first', 'last',
'difference'];
$scope.operators = ['=', '=~', '>', '<', '!~', '<>'];
$scope.oldSeries = $scope.target.series;
$scope.$on('typeahead-updated', function(){

3
src/app/services/influxdb/influxdbDatasource.js
View File

@ -23,8 +23,7 @@ function (angular, _, kbn) {
};
}
InfluxDatasource.prototype.query = function(options) {
InfluxDatasource.prototype.query = function(filterSrv, options) {
var promises = _.map(options.targets, function(target) {
var query;

433
src/css/default.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
src/index.html
View File

@ -7,23 +7,16 @@
<meta name="viewport" content="width=device-width">
<title>Grafana</title>
<link rel="stylesheet" href="css/bootstrap.dark.min.css" title="Light">
<link rel="stylesheet" href="css/timepicker.css">
<link rel="stylesheet" href="css/spectrum.css">
<link rel="stylesheet" href="css/animate.min.css">
<link rel="stylesheet" href="css/normalize.min.css">
<link rel="stylesheet" href="css/default.min.css" title="Light">
<!-- load the root require context -->
<script src="vendor/require/require.js"></script>
<script src="app/components/require.config.js"></script>
<script>require(['app'], function () {})</script>
<style>
</style>
</head>
<body ng-cloak body-class>
<!--<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">-->
<link rel="stylesheet" ng-href="css/bootstrap.{{dashboard.current.style||'dark'}}.min.css">
<link rel="stylesheet" href="css/bootstrap-responsive.min.css">
<link rel="stylesheet" href="css/font-awesome.min.css">

4
tasks/default_task.js
View File

@ -1,5 +1,5 @@
// Lint and build CSS
module.exports = function(grunt) {
grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src']);
grunt.registerTask('default', ['jshint:source', 'jshint:tests', 'less:src', 'concat']);
grunt.registerTask('test', ['default', 'karma:test']);
};
};

14
tasks/options/concat.js Normal file
View File

@ -0,0 +1,14 @@
module.exports = function(config) {
return {
css: {
src: [
'<%= srcDir %>/css/normalize.min.css',
'<%= srcDir %>/css/bootstrap.dark.min.css',
'<%= srcDir %>/css/timepicker.css',
'<%= srcDir &>/css/spectrum.css',
'<%= srcDir &>/css/animate.min.css'
],
dest: '<%= srcDir %>/css/default.min.css'
},
};
};