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

Merge pull request #113 from rashidkpc/master

Browse Source 
Tweaks and bug fixed
pull/7/head
Rashid Khan 12 years ago
parent 0918a263f6 82e40230a8
commit 9a48b67021
11 changed files with 96 additions and 31 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. 1
      common/lib/panels/jquery.flot.stack.js
  2. 17
      index.html
  3. 8
      js/app.js
  4. 2
      js/directives.js
  5. 3
      panels/histogram/editor.html
  6. 17
      panels/histogram/module.js
  7. 4
      panels/pie/editor.html
  8. 6
      panels/timepicker/module.js
  9. 2
      partials/dashboard.html
  10. 61
      sample/apache_ldap.conf
  11. 0
      sample/nginx.conf

1
common/lib/panels/jquery.flot.stack.js
Unescape View File

@ -203,7 +203,6 @@ charts or filled areas).
//set percentage for stacked chart //set percentage for stacked chart
function processRawData(plot, series, data, datapoints) { function processRawData(plot, series, data, datapoints) {
console.log(plot)
if (!processed) { if (!processed) {
processed = true; processed = true;
stackSums = getStackSums(plot.getData()); stackSums = getStackSums(plot.getData());

17
index.html
Unescape View File

@ -20,6 +20,14 @@
<link rel="stylesheet" href="common/css/elasticjs.css"> <link rel="stylesheet" href="common/css/elasticjs.css">
<link rel="stylesheet" href="common/css/timepicker.css"> <link rel="stylesheet" href="common/css/timepicker.css">
<!-- project dependency libs -->
<script src="common/lib/LAB.min.js"></script>
<script src="common/lib/underscore.min.js"></script>
<script src="common/lib/settings.js"></script>
<script src="config.js"></script>
<script src="js/app.js"></script>
</head> </head>
<body ng-controller="DashCtrl" ng-cloak> <body ng-controller="DashCtrl" ng-cloak>
@ -32,7 +40,7 @@
<div class="container-fluid"> <div class="container-fluid">
<p class="navbar-text pull-right"><small><strong>Kibana 3</strong> <small>milestone 2</small></small></p> <p class="navbar-text pull-right"><small><strong>Kibana 3</strong> <small>milestone 2</small></small></p>
<span class="brand">{{dashboards.title}}</span> <span class="brand">{{dashboards.title}}</span>
<div class="brand"><i class='icon-edit pointer' ng-show='dashboards.editable' bs-modal="'partials/dasheditor.html'"></i></div> <div class="brand"><i class='icon-cog pointer' ng-show='dashboards.editable' bs-modal="'partials/dasheditor.html'"></i></div>
</div> </div>
</div> </div>
</div> </div>
@ -43,11 +51,4 @@
</div> </div>
</body> </body>
<!-- project dependency libs -->
<script src="common/lib/LAB.min.js"></script>
<script src="common/lib/underscore.min.js"></script>
<script src="common/lib/settings.js"></script>
<script src="config.js"></script>
<script src="js/app.js"></script>
</html> </html>

8
js/app.js
Unescape View File

@ -17,12 +17,9 @@ var modules = [
var scripts = [] var scripts = []
var labjs = $LAB var labjs = $LAB
.script("common/lib/jquery-1.8.0.min.js").wait() .script("common/lib/jquery-1.8.0.min.js")
.script("common/lib/modernizr-2.6.1.min.js") .script("common/lib/modernizr-2.6.1.min.js")
.script("common/lib/underscore.min.js") .script("common/lib/underscore.min.js")
.script("common/lib/bootstrap.min.js")
.script('common/lib/datepicker.js')
.script('common/lib/timepicker.js')
.script("common/lib/angular.min.js") .script("common/lib/angular.min.js")
.script("common/lib/angular-strap.min.js") .script("common/lib/angular-strap.min.js")
.script("common/lib/angular-sanitize.min.js") .script("common/lib/angular-sanitize.min.js")
@ -31,6 +28,9 @@ var labjs = $LAB
.script("common/lib/moment.js") .script("common/lib/moment.js")
.script("common/lib/shared.js") .script("common/lib/shared.js")
.script("common/lib/filesaver.js") .script("common/lib/filesaver.js")
.script("common/lib/bootstrap.min.js")
.script('common/lib/datepicker.js')
.script('common/lib/timepicker.js')
.script("js/services.js") .script("js/services.js")
.script("js/controllers.js") .script("js/controllers.js")
.script("js/filters.js") .script("js/filters.js")

2
js/directives.js
Unescape View File

@ -9,7 +9,7 @@ angular.module('kibana.directives', [])
link: function(scope, elem, attrs) { link: function(scope, elem, attrs) {
var template = '<img src="common/img/load.gif" class="panel-loading" ng-show="panel.loading == true">'+ var template = '<img src="common/img/load.gif" class="panel-loading" ng-show="panel.loading == true">'+
' <span class="editlink panelextra pointer" style="right:15px;top:0px" bs-modal="\'partials/paneleditor.html\'" ng-show="panel.editable != false">'+ ' <span class="editlink panelextra pointer" style="right:15px;top:0px" bs-modal="\'partials/paneleditor.html\'" ng-show="panel.editable != false">'+
'<span class="small">{{panel.type}}</span> <i class="icon-edit pointer"></i>'+ '<span class="small">{{panel.type}}</span> <i class="icon-cog pointer"></i> '+
'</span><h4>{{panel.title}}</h4>'; '</span><h4>{{panel.title}}</h4>';
elem.prepend($compile(angular.element(template))(scope)); elem.prepend($compile(angular.element(template))(scope));
} }

3
panels/histogram/editor.html
Unescape View File

@ -66,10 +66,11 @@
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span3"> <div class="span2">
<label class="small">Time correction</label> <label class="small">Time correction</label>
<select ng-model="panel.timezone" class='input-small' ng-options="f for f in ['browser','utc']"></select> <select ng-model="panel.timezone" class='input-small' ng-options="f for f in ['browser','utc']"></select>
</div> </div>
<div class="span1"> <label class="small">Selectable</label><input type="checkbox" ng-model="panel.interactive" ng-checked="panel.interactive"></div>
<div class="span2"> <div class="span2">
<label class="small">Zoom Links</label><input type="checkbox" ng-model="panel.zoomlinks" ng-checked="panel.zoomlinks" /> <label class="small">Zoom Links</label><input type="checkbox" ng-model="panel.zoomlinks" ng-checked="panel.zoomlinks" />
</div> </div>

17
panels/histogram/module.js
Unescape View File

@ -31,6 +31,7 @@
* legend :: Show the legend? * legend :: Show the legend?
* x-axis :: Show x-axis labels and grid lines * x-axis :: Show x-axis labels and grid lines
* y-axis :: Show y-axis labels and grid lines * y-axis :: Show y-axis labels and grid lines
* interactive :: Allow drag to select time range
### Group Events ### Group Events
#### Receives #### Receives
* time :: An object containing the time range to use and the index(es) to query * time :: An object containing the time range to use and the index(es) to query
@ -64,7 +65,8 @@ angular.module('kibana.histogram', [])
legend : true, legend : true,
'x-axis' : true, 'x-axis' : true,
'y-axis' : true, 'y-axis' : true,
percentage : false percentage : false,
interactive : true,
} }
_.defaults($scope.panel,_d) _.defaults($scope.panel,_d)
@ -288,7 +290,7 @@ angular.module('kibana.histogram', [])
// Populate element // Populate element
try { try {
scope.plot = $.plot(elem, scope.data, { var options = {
legend: { show: false }, legend: { show: false },
series: { series: {
stackpercent: scope.panel.stack ? scope.panel.percentage : false, stackpercent: scope.panel.stack ? scope.panel.percentage : false,
@ -317,10 +319,6 @@ angular.module('kibana.histogram', [])
label: "Datetime", label: "Datetime",
color: "#c8c8c8", color: "#c8c8c8",
}, },
selection: {
mode: "x",
color: '#ccc'
},
grid: { grid: {
backgroundColor: null, backgroundColor: null,
borderWidth: 0, borderWidth: 0,
@ -329,7 +327,12 @@ angular.module('kibana.histogram', [])
hoverable: true, hoverable: true,
}, },
colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D'] colors: ['#86B22D','#BF6730','#1D7373','#BFB930','#BF3030','#77207D']
}) }
if(scope.panel.interactive)
options.selection = { mode: "x", color: '#aaa' };
scope.plot = $.plot(elem, scope.data, options)
// Work around for missing legend at initialization // Work around for missing legend at initialization
if(!scope.$$phase) if(!scope.$$phase)

4
panels/pie/editor.html
Unescape View File

@ -1,10 +1,10 @@
<div class="row-fluid" ng-switch="panel.mode"> <div class="row-fluid" ng-switch="panel.mode">
<div ng-switch-when="terms">
<div class="row-fluid">
<div class="span3"> <div class="span3">
<label class="small">Mode</label> <label class="small">Mode</label>
<select class="input-small" ng-change="set_mode(panel.mode)" ng-model="panel.mode" ng-options="f for f in ['terms','goal']"></select> <select class="input-small" ng-change="set_mode(panel.mode)" ng-model="panel.mode" ng-options="f for f in ['terms','goal']"></select>
</div> </div>
<div ng-switch-when="terms">
<div class="row-fluid">
<div class="span3"> <div class="span3">
<form style="margin-bottom: 0px"> <form style="margin-bottom: 0px">
<label class="small">Field</label> <label class="small">Field</label>

6
panels/timepicker/module.js
Unescape View File

@ -61,13 +61,13 @@ angular.module('kibana.timepicker', [])
switch($scope.panel.mode) { switch($scope.panel.mode) {
case 'absolute': case 'absolute':
$scope.time = { $scope.time = {
from : moment($scope.panel.time.from,'YYYY-MM-DD HH:mm:ss') || moment(time_ago($scope.panel.timespan)), from : moment($scope.panel.time.from,'MM/DD/YYYY HH:mm:ss') || moment(time_ago($scope.panel.timespan)),
to : moment($scope.panel.time.to,'YYYY-MM-DD HH:mm:ss') || moment() to : moment($scope.panel.time.to,'MM/DD/YYYY HH:mm:ss') || moment()
} }
break; break;
case 'since': case 'since':
$scope.time = { $scope.time = {
from : moment($scope.panel.time.from,'YYYY-MM-DD HH:mm:ss') || moment(time_ago($scope.panel.timespan)), from : moment($scope.panel.time.from,'MM/DD/YYYY HH:mm:ss') || moment(time_ago($scope.panel.timespan)),
to : moment() to : moment()
} }
break; break;

2
partials/dashboard.html
Unescape View File

@ -9,7 +9,7 @@
<div ng-show="row.collapsable"> <div ng-show="row.collapsable">
<div ng-class="{'row-open': !row.collapse, 'row-close': row.collapse}" style="position:absolute;margin-left:-60px;"> <div ng-class="{'row-open': !row.collapse, 'row-close': row.collapse}" style="position:absolute;margin-left:-60px;">
<span class='pointer' ng-click="toggle_row(row)">{{row.title}}</span> <span class='pointer' ng-click="toggle_row(row)">{{row.title}}</span>
<i ng-show="row.editable" class="icon-edit pointer editlink" bs-modal="'partials/roweditor.html'"></i> <i ng-show="row.editable" class="icon-cog pointer editlink" bs-modal="'partials/roweditor.html'"></i>
</div> </div>
</div> </div>
<small ng-hide="row.collapsable" class="rotated">{{row.title}}</small> <small ng-hide="row.collapsable" class="rotated">{{row.title}}</small>

61
sample/apache_ldap.conf
Unescape View File

@ -0,0 +1,61 @@
# Courtesy of https://github.com/sgzijl
# config.js includes elasticsearch: "https://"+window.location.hostname+":443",
<VirtualHost 1.2.3.4:80>
ServerName your.domain.tld
RewriteEngine On
RewriteCond %{HTTPS} off
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
</VirtualHost>
<VirtualHost 1.2.3.4:443>
ServerName your.domain.tld
SSLEngine on
SSLCertificateFile /path/to/public.crt
SSLCertificateKeyFile /path/to/private.key
DocumentRoot /path/to/kibana3
<Directory /path/to/kibana3>
Allow from all
Options -Multiviews
</Directory>
LogLevel debug
ErrorLog /path/to/logs/error_log
CustomLog /path/to/logs/access_log combined
# Set global proxy timeouts
<Proxy http://127.0.0.1:9200>
ProxySet connectiontimeout=5 timeout=90
</Proxy>
# Proxy for _aliases and .*/_search
<LocationMatch "^(/_aliases|.*/_search)$">
ProxyPass http://127.0.0.1:9200
ProxyPassReverse http://127.0.0.1:9200
</LocationMatch>
# Proxy for kibana-int/{dashboard,temp} stuff (if you don't want auth on /, then you will want these to be protected)
<LocationMatch "^(/kibana-int/dashboard/|/kibana-int/temp).*$">
ProxyPass http://127.0.0.1:9200
ProxyPassReverse http://127.0.0.1:9200
</LocationMatch>
# Optional disable auth for a src IP (eg: your monitoring host or subnet)
<Location />
Allow from 5.6.7.8
Deny from all
Satisfy any
AuthLDAPBindDN "CN=_ldapbinduser,OU=Users,DC=example,DC=com"
AuthLDAPBindPassword "ldapbindpass"
AuthLDAPURL "ldaps://ldap01.example.com ldap02.example.com/OU=Users,DC=example,DC=com?sAMAccountName?sub?(objectClass=*)"
AuthType Basic
AuthBasicProvider ldap
AuthName "Please authenticate for Example dot com"
AuthLDAPGroupAttributeIsDN on
require valid-user
</Location>
</VirtualHost>

0
sample/kibana.conf → sample/nginx.conf
Unescape View File

Write Preview
Loading…
Cancel
Save