apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

preparing for first release

Browse Source
pull/7/head
Torkel Ödegaard 12 years ago
parent 3fbe3be30e
commit e4b52905d1
9 changed files with 18 additions and 140 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 87
      index.html
  2. 10
      package.json
  3. 5
      src/app/components/settings.js
  4. 4
      src/app/controllers/metricKeys.js
  5. 8
      src/app/services/dashboard.js
  6. 38
      src/config.js
  7. 6
      tasks/distribute_task.js
  8. BIN
      tmp/grafana-0.1.tar.gz
  9. BIN
      tmp/grafana-0.1.zip

87
index.html
Unescape View File

@ -1,87 +0,0 @@
<!DOCTYPE html>
<head>
<title>Kibana 3</title>
<style>/* add your css style rules here */
body {
color:#c8c8c8;
background-color:#272b30;
font-family: 'Open Sans', sans-serif;
}
a {
color: #63ABB5;
}
.title1 {
font-weight: 800;
line-height: .9;
font-size: 98px
}
.title2 {
font-weight: 800;
line-height: .9;
font-size: 60px
}
.title3 {
font-weight: 800;
font-size: 25px;
line-height: 1.1;
}
.lowercase {
text-transform: lowercase;
}
.uppercase {
text-transform: uppercase;
}
.light {
font-weight: 200;
}
.big { text-transform: uppercase; margin: 0; padding: 0; }
.bold { font-weight: 800; }
.orange {
color: #FF9640;
}
.yellow {
color: #FFDD68;
}
.teal {
color: #63ABB5;
}
.green {
color: #629153;
}
.purple {
color: #645068;
}
.white {
color: #fff;
}
</style>
</head>
<body ng-controller="DashCtrl" ng-cloak>
<img src='src/img/kibana.png' style="float:right;margin:30px 60px 30px 60px;"><p>
<div class="title2">
<span class="orange">Oops.</span> Looks like you've upgraded from an old version
</div>
<div class="title3">No worries. <span class="light">Kibana has a new build system. Now its faster and lighter than ever before.</span></div>
<p>
<div class="white title3 uppercase">To fix this</div>
<div class="title3 light">Instead of cloning the entire kibana, you can grab the latest build here: <a href="http://download.elasticsearch.org/kibana/kibana/kibana-latest.zip">http://download.elasticsearch.org/kibana/kibana/kibana-latest.zip</a><p>
If you really want to run from source you can do so from the <a href="src/index.html">src/</a> folder. After upgrading you may need to clear your browsers cache to see all of the new features.</div>
</body>
</html>

10
package.json
Unescape View File

@ -1,13 +1,13 @@
{
"author": {
"name": "Rashid Khan",
"company": "Elasticsearch BV"
"name": "Torkel Ödegaard",
"company": "Coding Instinct AB"
},
"name": "kibana",
"version": "3.0.0pre-milestone5",
"name": "grafana",
"version": "0.1",
"repository": {
"type": "git",
"url": "http://github.com/elasticsearch/kibana.git"
"url": "http://github.com/torkelo/grafana.git"
},
"devDependencies": {
"rjs-build-analysis": "0.0.3",

5
src/app/components/settings.js
Unescape View File

@ -11,11 +11,10 @@ function (_) {
*/
var defaults = {
elasticsearch : "http://"+window.location.hostname+":9200",
graphiteUrl : "http://"+window.location.hostname+":8080",
panel_names : [],
kibana_index : 'kibana-int',
graphiteUrl : null,
default_route : '/dashboard/file/default.json',
grafana_index : 'grafana-int2'
grafana_index : 'grafana-dash'
};
// This initializes a new hash on purpose, to avoid adding parameters to

4
src/app/controllers/metricKeys.js
Unescape View File

@ -9,7 +9,7 @@ function (angular, _, config) {
var module = angular.module('kibana.controllers');
module.controller('MetricKeysCtrl', function($scope, $http, $q) {
var elasticSearchUrlForMetricIndex = config.elasticsearch + '/' + config.grafana_index + '/';
var elasticSearchUrlForMetricIndex = config.elasticsearch + '/' + config.grafana_metrics_index + '/';
$scope.init = function () {
$scope.metricPath = "prod.apps.api.boobarella.*";
@ -149,7 +149,7 @@ function (angular, _, config) {
function saveMetricKey(metricId) {
// Create request with id as title. Rethink this.
var request = $scope.ejs.Document(config.grafana_index, 'metricKey', metricId).source({
var request = $scope.ejs.Document(config.grafana_metrics_index, 'metricKey', metricId).source({
metricPath: metricId
});

8
src/app/services/dashboard.js
Unescape View File

@ -287,7 +287,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
this.elasticsearch_load = function(type,id) {
return $http({
url: config.elasticsearch + "/" + config.kibana_index + "/"+type+"/"+id+'?' + new Date().getTime(),
url: config.elasticsearch + "/" + config.grafana_index + "/"+type+"/"+id+'?' + new Date().getTime(),
method: "GET",
transformResponse: function(response) {
return renderTemplate(angular.fromJson(response)._source.dashboard, $routeParams);
@ -340,7 +340,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
}
// Create request with id as title. Rethink this.
var request = ejs.Document(config.kibana_index,type,id).source({
var request = ejs.Document(config.grafana_index,type,id).source({
user: 'guest',
group: 'guest',
title: save.title,
@ -365,7 +365,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
};
this.elasticsearch_delete = function(id) {
return ejs.Document(config.kibana_index,'dashboard',id).doDelete(
return ejs.Document(config.grafana_index,'dashboard',id).doDelete(
// Success
function(result) {
return result;
@ -378,7 +378,7 @@ function (angular, $, kbn, _, config, moment, Modernizr) {
};
this.elasticsearch_list = function(query,count) {
var request = ejs.Request().indices(config.kibana_index).types('dashboard');
var request = ejs.Request().indices(config.grafana_index).types('dashboard');
return request.query(
ejs.QueryStringQuery(query || '*')
).size(count).doSearch(

38
src/config.js
Unescape View File

@ -7,50 +7,16 @@ define(['settings'],
function (Settings) {
"use strict";
/** @scratch /configuration/config.js/2
* === Parameters
*/
return new Settings({
/** @scratch /configuration/config.js/5
* ==== elasticsearch
*
* The URL to your elasticsearch server. You almost certainly don't
* want +http://localhost:9200+ here. Even if Grafana and Elasticsearch are on
* the same host. By default this will attempt to reach ES at the same host you have
* Grafana installed on. You probably want to set it to the FQDN of your
* elasticsearch host
*/
elasticsearch: "http://"+window.location.hostname+":9200",
graphiteUrl: "http://"+window.location.hostname+":8080",
/** @scratch /configuration/config.js/5
* ==== default_route
*
* This is the default landing page when you don't specify a dashboard to load. You can specify
* files, scripts or saved dashboards here. For example, if you had saved a dashboard called
* `WebLogs' to elasticsearch you might use:
*
* +default_route: '/dashboard/elasticsearch/WebLogs',+
*/
default_route : '/dashboard/file/default.json',
default_route: '/dashboard/file/default.json',
/** @scratch /configuration/config.js/5
* ==== Grafana-int
*
* The default ES index to use for storing Grafana specific object
* such as stored dashboards
*/
kibana_index: "kibana-int",
grafana_index: "grafana-int",
grafana_index: "grafana-dash",
/** @scratch /configuration/config.js/5
* ==== panel_name
*
* An array of panel modules available. Panels will only be loaded when they are defined in the
* dashboard, but this list is used in the "add panel" interface.
*/
panel_names: [
'text',
'graphite'

6
tasks/distribute_task.js
Unescape View File

@ -12,12 +12,12 @@ module.exports = function(grunt) {
// build, then zip and upload to s3
grunt.registerTask('release', [
'distribute:load_s3_config',
// 'distribute:load_s3_config',
'build',
'compress:zip_release',
'compress:tgz_release',
's3:release',
'clean:temp'
//'s3:release',
//'clean:temp'
]);
// collect the key and secret from the .aws-config.json file, finish configuring the s3 task

BIN
tmp/grafana-0.1.tar.gz
View File

Binary file not shown.

BIN
tmp/grafana-0.1.zip
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save