opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-01 09:03:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc(): added elasticsearch.yml config file to docker test env

Browse Source
This commit is contained in:
Torkel Ödegaard
2016-02-29 13:42:55 +01:00
parent 56c080417a
commit 3624587f08
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docker/blocks/elastic/elasticsearch.yml Normal file
View File

@ -0,0 +1,2 @@
script.inline: on
script.indexed: on

1
docker/blocks/elastic/elasticsearch/config/.placeholder
View File

@ -1 +0,0 @@
Ensure the existence of the parent folder.

2
docker/blocks/elastic/fig
View File

@ -4,3 +4,5 @@ elasticsearch:
ports: ports:
- "9200:9200" - "9200:9200"
- "9300:9300" - "9300:9300"
volumes:
- ./blocks/elastic/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml

1
public/app/features/templating/templateValuesSrv.js
View File

@ -45,6 +45,7 @@ function (angular, _, kbn) {
}; };
this.setVariableFromUrl = function(variable, urlValue) { this.setVariableFromUrl = function(variable, urlValue) {
debugger;
var option = _.findWhere(variable.options, { text: urlValue }); var option = _.findWhere(variable.options, { text: urlValue });
option = option || { text: urlValue, value: urlValue }; option = option || { text: urlValue, value: urlValue };

6
public/sass/base/_fonts.scss
View File

@ -8,7 +8,7 @@
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
.icon-gf { .icon-gf {
/* use !important to prevent issues with browser extensions that change fonts */ /* use !important to prevent issues with browser extensions that change fonts */
font-family: 'grafana-icons' !important; font-family: 'grafana-icons' !important;
@ -28,10 +28,6 @@
vertical-align: middle; vertical-align: middle;
} }
.icon-gf-raintank_wordmark:before { .icon-gf-raintank_wordmark:before {
content: "\e600"; content: "\e600";
} }