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 2017-09-13 09:48:56 +02:00
commit 10f058036c
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/core/components/code_editor/code_editor.ts
View File

@ -40,11 +40,11 @@ const DEFAULT_MAX_LINES = 10;
const DEFAULT_TAB_SIZE = 2; const DEFAULT_TAB_SIZE = 2;
const DEFAULT_BEHAVIOURS = true; const DEFAULT_BEHAVIOURS = true;
const GRAFANA_MODULES = ['mode-prometheus', 'snippets-prometheus', 'theme-grafana-dark']; const GRAFANA_MODULES = ['theme-grafana-dark'];
const GRAFANA_MODULE_BASE = "public/app/core/components/code_editor/"; const GRAFANA_MODULE_BASE = "public/app/core/components/code_editor/";
// Trick for loading additional modules // Trick for loading additional modules
function setModuleUrl(moduleType, name) { function setModuleUrl(moduleType, name, pluginBaseUrl = null) {
let baseUrl = ACE_SRC_BASE; let baseUrl = ACE_SRC_BASE;
let aceModeName = `ace/${moduleType}/${name}`; let aceModeName = `ace/${moduleType}/${name}`;
let moduleName = `${moduleType}-${name}`; let moduleName = `${moduleType}-${name}`;
@ -54,6 +54,10 @@ function setModuleUrl(moduleType, name) {
baseUrl = GRAFANA_MODULE_BASE; baseUrl = GRAFANA_MODULE_BASE;
} }
if (pluginBaseUrl) {
baseUrl = pluginBaseUrl + '/';
}
if (moduleType === 'snippets') { if (moduleType === 'snippets') {
componentName = `${moduleType}/${name}.js`; componentName = `${moduleType}/${name}.js`;
} }
@ -159,8 +163,8 @@ function link(scope, elem, attrs) {
function setLangMode(lang) { function setLangMode(lang) {
let aceModeName = `ace/mode/${lang}`; let aceModeName = `ace/mode/${lang}`;
setModuleUrl("mode", lang); setModuleUrl("mode", lang, scope.datasource.meta.baseUrl || null);
setModuleUrl("snippets", lang); setModuleUrl("snippets", lang, scope.datasource.meta.baseUrl || null);
editorSession.setMode(aceModeName); editorSession.setMode(aceModeName);
ace.config.loadModule("ace/ext/language_tools", (language_tools) => { ace.config.loadModule("ace/ext/language_tools", (language_tools) => {
@ -210,6 +214,7 @@ export function codeEditorDirective() {
template: editorTemplate, template: editorTemplate,
scope: { scope: {
content: "=", content: "=",
datasource: "=",
codeEditorFocus: "<", codeEditorFocus: "<",
onChange: "&", onChange: "&",
getCompleter: "&" getCompleter: "&"

0
public/app/core/components/code_editor/mode-prometheus.js → public/app/plugins/datasource/prometheus/mode-prometheus.js
View File

2
public/app/plugins/datasource/prometheus/partials/query.editor.html
View File

@ -1,7 +1,7 @@
<query-editor-row query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="false"> <query-editor-row query-ctrl="ctrl" can-collapse="true" has-text-edit-mode="false">
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form gf-form--grow"> <div class="gf-form gf-form--grow">
<code-editor content="ctrl.target.expr" on-change="ctrl.refreshMetricData()" <code-editor content="ctrl.target.expr" datasource="ctrl.datasource" on-change="ctrl.refreshMetricData()"
get-completer="ctrl.getCompleter()" data-mode="prometheus" code-editor-focus="ctrl.isLastQuery"> get-completer="ctrl.getCompleter()" data-mode="prometheus" code-editor-focus="ctrl.isLastQuery">
</code-editor> </code-editor>
</div> </div>

0
public/app/core/components/code_editor/snippets/prometheus.js → public/app/plugins/datasource/prometheus/snippets/prometheus.js
View File