mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Add example apache/ldap proxy config, fixed timepicker init bug, removed debug statement from stack
This commit is contained in:
parent
ccc1eafa69
commit
fe2c9c21ad
@ -203,7 +203,6 @@ charts or filled areas).
|
||||
|
||||
//set percentage for stacked chart
|
||||
function processRawData(plot, series, data, datapoints) {
|
||||
console.log(plot)
|
||||
if (!processed) {
|
||||
processed = true;
|
||||
stackSums = getStackSums(plot.getData());
|
||||
|
@ -61,13 +61,13 @@ angular.module('kibana.timepicker', [])
|
||||
switch($scope.panel.mode) {
|
||||
case 'absolute':
|
||||
$scope.time = {
|
||||
from : moment($scope.panel.time.from,'YYYY-MM-DD HH:mm:ss') || moment(time_ago($scope.panel.timespan)),
|
||||
to : moment($scope.panel.time.to,'YYYY-MM-DD HH:mm:ss') || moment()
|
||||
from : moment($scope.panel.time.from,'MM/DD/YYYY HH:mm:ss') || moment(time_ago($scope.panel.timespan)),
|
||||
to : moment($scope.panel.time.to,'MM/DD/YYYY HH:mm:ss') || moment()
|
||||
}
|
||||
break;
|
||||
case 'since':
|
||||
$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()
|
||||
}
|
||||
break;
|
||||
|
61
sample/apache_ldap.conf
Normal file
61
sample/apache_ldap.conf
Normal 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>
|
Loading…
Reference in New Issue
Block a user