{
if (datasourceType === 'prometheus') {
return Promise.all(
queries.map(async query => {
@@ -167,8 +173,9 @@ export default class LokiLanguageProvider extends LanguageProvider {
})
);
}
+ // Return a cleaned LokiQuery
return queries.map(query => ({
- ...query,
+ refId: query.refId,
expr: '',
}));
}
diff --git a/public/app/plugins/datasource/loki/result_transformer.ts b/public/app/plugins/datasource/loki/result_transformer.ts
index 1f86f20d6fd..9cd4ee0779b 100644
--- a/public/app/plugins/datasource/loki/result_transformer.ts
+++ b/public/app/plugins/datasource/loki/result_transformer.ts
@@ -5,7 +5,7 @@ import {
LogLevel,
LogsMetaItem,
LogsModel,
- LogRow,
+ LogRowModel,
LogsStream,
LogsStreamEntry,
LogsStreamLabels,
@@ -115,7 +115,7 @@ export function processEntry(
parsedLabels: LogsStreamLabels,
uniqueLabels: LogsStreamLabels,
search: string
-): LogRow {
+): LogRowModel {
const { line } = entry;
const ts = entry.ts || entry.timestamp;
// Assumes unique-ness, needs nanosec precision for timestamp
@@ -156,9 +156,9 @@ export function mergeStreamsToLogs(streams: LogsStream[], limit = DEFAULT_MAX_LI
}));
// Merge stream entries into single list of log rows
- const sortedRows: LogRow[] = _.chain(streams)
+ const sortedRows: LogRowModel[] = _.chain(streams)
.reduce(
- (acc: LogRow[], stream: LogsStream) => [
+ (acc: LogRowModel[], stream: LogsStream) => [
...acc,
...stream.entries.map(entry =>
processEntry(entry, stream.labels, stream.parsedLabels, stream.uniqueLabels, stream.search)
diff --git a/public/app/plugins/datasource/loki/types.ts b/public/app/plugins/datasource/loki/types.ts
new file mode 100644
index 00000000000..7325239bb3a
--- /dev/null
+++ b/public/app/plugins/datasource/loki/types.ts
@@ -0,0 +1,6 @@
+import { DataQuery } from '@grafana/ui/src/types';
+
+export interface LokiQuery extends DataQuery {
+ expr: string;
+}
+
diff --git a/public/app/plugins/datasource/postgres/partials/query.editor.html b/public/app/plugins/datasource/postgres/partials/query.editor.html
index 6c3bf02cb51..5d866245aff 100644
--- a/public/app/plugins/datasource/postgres/partials/query.editor.html
+++ b/public/app/plugins/datasource/postgres/partials/query.editor.html
@@ -138,9 +138,9 @@
Time series:
- return column named time (UTC in seconds or timestamp)
- return column(s) with numeric datatype as values
-Optional:
- - return column named metric to represent the series name.
- - If multiple value columns are returned the metric column is used as prefix.
+Optional:
+ - return column named metric to represent the series name.
+ - If multiple value columns are returned the metric column is used as prefix.
- If no column named metric is found the column name of the value column is used as series name
Resultsets of time series queries need to be sorted by time.
diff --git a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
index 6171c662127..f5b5b311b2a 100644
--- a/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
+++ b/public/app/plugins/datasource/prometheus/components/PromQueryField.tsx
@@ -11,7 +11,7 @@ import { getNextCharacter, getPreviousCousin } from 'app/features/explore/utils/
import BracesPlugin from 'app/features/explore/slate-plugins/braces';
import RunnerPlugin from 'app/features/explore/slate-plugins/runner';
import QueryField, { TypeaheadInput, QueryFieldState } from 'app/features/explore/QueryField';
-import { DataQuery } from 'app/types';
+import { PromQuery } from '../types';
const HISTOGRAM_GROUP = '__histograms__';
const METRIC_MARK = 'metric';
@@ -88,18 +88,16 @@ interface CascaderOption {
interface PromQueryFieldProps {
datasource: any;
error?: string | JSX.Element;
- initialQuery: DataQuery;
+ initialQuery: PromQuery;
hint?: any;
history?: any[];
- metricsByPrefix?: CascaderOption[];
onClickHintFix?: (action: any) => void;
onPressEnter?: () => void;
- onQueryChange?: (value: DataQuery, override?: boolean) => void;
+ onQueryChange?: (value: PromQuery, override?: boolean) => void;
}
interface PromQueryFieldState {
metricsOptions: any[];
- metricsByPrefix: CascaderOption[];
syntaxLoaded: boolean;
}
@@ -124,7 +122,6 @@ class PromQueryField extends React.PureComponent
- group.rules.filter(rule => rule.type === 'recording').reduce(
- (acc, rule) => ({
- ...acc,
- [rule.name]: rule.query,
- }),
- mapping
- ),
- {}
- );
-}
-
-export function prometheusRegularEscape(value) {
- if (typeof value === 'string') {
- return value.replace(/'/g, "\\\\'");
- }
- return value;
-}
-
-export function prometheusSpecialRegexEscape(value) {
- if (typeof value === 'string') {
- return prometheusRegularEscape(value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]+?.()]/g, '\\\\$&'));
- }
- return value;
-}
-
-export class PrometheusDatasource {
+export class PrometheusDatasource implements DataSourceApi {
type: string;
editorSrc: string;
name: string;
@@ -149,7 +116,7 @@ export class PrometheusDatasource {
return this.templateSrv.variableExists(target.expr);
}
- query(options) {
+ query(options: DataQueryOptions) {
const start = this.getPrometheusTime(options.range.from, false);
const end = this.getPrometheusTime(options.range.to, true);
@@ -423,7 +390,7 @@ export class PrometheusDatasource {
});
}
- getExploreState(queries: DataQuery[]): Partial {
+ getExploreState(queries: PromQuery[]): Partial {
let state: Partial = { datasource: this.name };
if (queries && queries.length > 0) {
const expandedQueries = queries.map(query => ({
@@ -438,7 +405,7 @@ export class PrometheusDatasource {
return state;
}
- getQueryHints(query: DataQuery, result: any[]) {
+ getQueryHints(query: PromQuery, result: any[]) {
return getQueryHints(query.expr || '', result, this);
}
@@ -457,7 +424,7 @@ export class PrometheusDatasource {
});
}
- modifyQuery(query: DataQuery, action: any): DataQuery {
+ modifyQuery(query: PromQuery, action: any): PromQuery {
let expression = query.expr || '';
switch (action.type) {
case 'ADD_FILTER': {
@@ -507,3 +474,40 @@ export class PrometheusDatasource {
return this.resultTransformer.getOriginalMetricName(labelData);
}
}
+
+export function alignRange(start, end, step) {
+ const alignedEnd = Math.ceil(end / step) * step;
+ const alignedStart = Math.floor(start / step) * step;
+ return {
+ end: alignedEnd,
+ start: alignedStart,
+ };
+}
+
+export function extractRuleMappingFromGroups(groups: any[]) {
+ return groups.reduce(
+ (mapping, group) =>
+ group.rules.filter(rule => rule.type === 'recording').reduce(
+ (acc, rule) => ({
+ ...acc,
+ [rule.name]: rule.query,
+ }),
+ mapping
+ ),
+ {}
+ );
+}
+
+export function prometheusRegularEscape(value) {
+ if (typeof value === 'string') {
+ return value.replace(/'/g, "\\\\'");
+ }
+ return value;
+}
+
+export function prometheusSpecialRegexEscape(value) {
+ if (typeof value === 'string') {
+ return prometheusRegularEscape(value.replace(/\\/g, '\\\\\\\\').replace(/[$^*{}\[\]+?.()]/g, '\\\\$&'));
+ }
+ return value;
+}
diff --git a/public/app/plugins/datasource/prometheus/query_hints.ts b/public/app/plugins/datasource/prometheus/query_hints.ts
index ce019e3ddcb..d3216874ab5 100644
--- a/public/app/plugins/datasource/prometheus/query_hints.ts
+++ b/public/app/plugins/datasource/prometheus/query_hints.ts
@@ -1,6 +1,5 @@
import _ from 'lodash';
-
-import { QueryHint } from 'app/types/explore';
+import { QueryHint } from '@grafana/ui/src/types';
/**
* Number of time series results needed before starting to suggest sum aggregation hints
diff --git a/public/app/plugins/datasource/prometheus/types.ts b/public/app/plugins/datasource/prometheus/types.ts
new file mode 100644
index 00000000000..5bdc687d774
--- /dev/null
+++ b/public/app/plugins/datasource/prometheus/types.ts
@@ -0,0 +1,6 @@
+import { DataQuery } from '@grafana/ui/src/types';
+
+export interface PromQuery extends DataQuery {
+ expr: string;
+}
+
diff --git a/public/app/plugins/datasource/stackdriver/components/AlignmentPeriods.tsx b/public/app/plugins/datasource/stackdriver/components/AlignmentPeriods.tsx
index 0a8715714da..a86f37073f3 100644
--- a/public/app/plugins/datasource/stackdriver/components/AlignmentPeriods.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/AlignmentPeriods.tsx
@@ -1,4 +1,4 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
import _ from 'lodash';
import kbn from 'app/core/utils/kbn';
@@ -14,7 +14,7 @@ export interface Props {
usedAlignmentPeriod: string;
}
-export const AlignmentPeriods: SFC = ({
+export const AlignmentPeriods: FC = ({
alignmentPeriod,
templateSrv,
onChange,
diff --git a/public/app/plugins/datasource/stackdriver/components/Alignments.tsx b/public/app/plugins/datasource/stackdriver/components/Alignments.tsx
index b97cce9e620..3b7010036e9 100644
--- a/public/app/plugins/datasource/stackdriver/components/Alignments.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/Alignments.tsx
@@ -1,4 +1,4 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
import _ from 'lodash';
import { MetricSelect } from 'app/core/components/Select/MetricSelect';
@@ -12,7 +12,7 @@ export interface Props {
perSeriesAligner: string;
}
-export const Alignments: SFC = ({ perSeriesAligner, templateSrv, onChange, alignOptions }) => {
+export const Alignments: FC = ({ perSeriesAligner, templateSrv, onChange, alignOptions }) => {
return (
<>
diff --git a/public/app/plugins/datasource/stackdriver/components/AnnotationsHelp.tsx b/public/app/plugins/datasource/stackdriver/components/AnnotationsHelp.tsx
index 71c54fe5f76..fb0d42f0dc2 100644
--- a/public/app/plugins/datasource/stackdriver/components/AnnotationsHelp.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/AnnotationsHelp.tsx
@@ -1,6 +1,6 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
-export const AnnotationsHelp: SFC = () => {
+export const AnnotationsHelp: FC = () => {
return (
diff --git a/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx b/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
index 3a4a0707a2c..2a17fcdaf3e 100644
--- a/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
+++ b/public/app/plugins/datasource/stackdriver/components/SimpleSelect.tsx
@@ -1,4 +1,4 @@
-import React, { SFC } from 'react';
+import React, { FC } from 'react';
interface Props {
onValueChange: (e) => void;
@@ -7,7 +7,7 @@ interface Props {
label: string;
}
-const SimpleSelect: SFC = props => {
+const SimpleSelect: FC = props => {
const { label, onValueChange, value, options } = props;
return (
diff --git a/public/app/plugins/datasource/testdata/QueryEditor.tsx b/public/app/plugins/datasource/testdata/QueryEditor.tsx
new file mode 100644
index 00000000000..20b86d571df
--- /dev/null
+++ b/public/app/plugins/datasource/testdata/QueryEditor.tsx
@@ -0,0 +1,66 @@
+// Libraries
+import React, { PureComponent } from 'react';
+import _ from 'lodash';
+
+// Services & Utils
+import { getBackendSrv, BackendSrv } from 'app/core/services/backend_srv';
+
+// Components
+import { FormLabel, Select, SelectOptionItem } from '@grafana/ui';
+
+// Types
+import { QueryEditorProps } from '@grafana/ui/src/types';
+import { TestDataDatasource } from './datasource';
+import { TestDataQuery, Scenario } from './types';
+
+interface State {
+ scenarioList: Scenario[];
+ current: Scenario | null;
+}
+
+type Props = QueryEditorProps
;
+
+export class QueryEditor extends PureComponent {
+ backendSrv: BackendSrv = getBackendSrv();
+
+ state: State = {
+ scenarioList: [],
+ current: null,
+ };
+
+ async componentDidMount() {
+ const { query, datasource } = this.props;
+
+ query.scenarioId = query.scenarioId || 'random_walk';
+
+ // const scenarioList = await this.backendSrv.get('/api/tsdb/testdata/scenarios');
+ const scenarioList = await datasource.getScenarios();
+ const current = _.find(scenarioList, { id: query.scenarioId });
+
+ this.setState({ scenarioList: scenarioList, current: current });
+ }
+
+ onScenarioChange = (item: SelectOptionItem) => {
+ this.props.onQueryChange({
+ scenarioId: item.value,
+ ...this.props.query
+ });
+ }
+
+ render() {
+ const { query } = this.props;
+ const options = this.state.scenarioList.map(item => ({ label: item.name, value: item.id }));
+ const current = options.find(item => item.value === query.scenarioId);
+
+ return (
+
+ );
+ }
+}
diff --git a/public/app/plugins/datasource/testdata/datasource.ts b/public/app/plugins/datasource/testdata/datasource.ts
index 989209792fb..6ba0da59457 100644
--- a/public/app/plugins/datasource/testdata/datasource.ts
+++ b/public/app/plugins/datasource/testdata/datasource.ts
@@ -1,15 +1,17 @@
import _ from 'lodash';
import TableModel from 'app/core/table_model';
+import { DataSourceApi, DataQueryOptions } from '@grafana/ui';
+import { TestDataQuery, Scenario } from './types';
-class TestDataDatasource {
- id: any;
+export class TestDataDatasource implements DataSourceApi {
+ id: number;
/** @ngInject */
constructor(instanceSettings, private backendSrv, private $q) {
this.id = instanceSettings.id;
}
- query(options) {
+ query(options: DataQueryOptions) {
const queries = _.filter(options.targets, item => {
return item.hide !== true;
}).map(item => {
@@ -91,6 +93,9 @@ class TestDataDatasource {
message: 'Data source is working',
});
}
+
+ getScenarios(): Promise {
+ return this.backendSrv.get('/api/tsdb/testdata/scenarios');
+ }
}
-export { TestDataDatasource };
diff --git a/public/app/plugins/datasource/testdata/module.ts b/public/app/plugins/datasource/testdata/module.ts
index ea01849b997..d3b376e3307 100644
--- a/public/app/plugins/datasource/testdata/module.ts
+++ b/public/app/plugins/datasource/testdata/module.ts
@@ -1,5 +1,6 @@
import { TestDataDatasource } from './datasource';
import { TestDataQueryCtrl } from './query_ctrl';
+// import { QueryEditor } from './QueryEditor';
class TestDataAnnotationsQueryCtrl {
annotation: any;
@@ -10,7 +11,7 @@ class TestDataAnnotationsQueryCtrl {
}
export {
- TestDataDatasource,
+ // QueryEditor,
TestDataDatasource as Datasource,
TestDataQueryCtrl as QueryCtrl,
TestDataAnnotationsQueryCtrl as AnnotationsQueryCtrl,
diff --git a/public/app/plugins/datasource/testdata/types.ts b/public/app/plugins/datasource/testdata/types.ts
new file mode 100644
index 00000000000..e233c3ef7a0
--- /dev/null
+++ b/public/app/plugins/datasource/testdata/types.ts
@@ -0,0 +1,11 @@
+import { DataQuery } from '@grafana/ui/src/types';
+
+export interface TestDataQuery extends DataQuery {
+ scenarioId: string;
+}
+
+export interface Scenario {
+ id: string;
+ name: string;
+}
+
diff --git a/public/app/plugins/panel/gauge/GaugeOptionsEditor.tsx b/public/app/plugins/panel/gauge/GaugeOptionsEditor.tsx
index 93fd67d608c..09e2c3c3772 100644
--- a/public/app/plugins/panel/gauge/GaugeOptionsEditor.tsx
+++ b/public/app/plugins/panel/gauge/GaugeOptionsEditor.tsx
@@ -1,5 +1,5 @@
import React, { PureComponent } from 'react';
-import { PanelOptionsProps, PanelOptionsGroup, Label } from '@grafana/ui';
+import { FormField, PanelOptionsProps, PanelOptionsGroup } from '@grafana/ui';
import { Switch } from 'app/core/components/Switch/Switch';
import { GaugeOptions } from './types';
@@ -21,14 +21,8 @@ export default class GaugeOptionsEditor extends PureComponent
-
-
-
-
-
-
-
-
+
+
{}
export class GaugePanel extends PureComponent {
+
render() {
const { timeSeries, width, height, onInterpolate, options } = this.props;
const prefix = onInterpolate(options.prefix);
const suffix = onInterpolate(options.suffix);
- const vmSeries = getTimeSeriesVMs({
+ const vmSeries = processTimeSeries({
timeSeries: timeSeries,
- nullValueMode: NullValueMode.Ignore,
+ nullValueMode: NullValueMode.Null,
});
return (
@@ -27,6 +35,7 @@ export class GaugePanel extends PureComponent {
height={height}
prefix={prefix}
suffix={suffix}
+ theme={contextSrv.getTheme()}
/>
);
}
diff --git a/public/app/plugins/panel/gauge/GaugePanelOptions.tsx b/public/app/plugins/panel/gauge/GaugePanelOptions.tsx
index 9729416b7e6..18a445d840d 100644
--- a/public/app/plugins/panel/gauge/GaugePanelOptions.tsx
+++ b/public/app/plugins/panel/gauge/GaugePanelOptions.tsx
@@ -1,6 +1,5 @@
import React, { PureComponent } from 'react';
import {
- BasicGaugeColor,
PanelOptionsProps,
ThresholdsEditor,
Threshold,
@@ -15,7 +14,6 @@ import { GaugeOptions } from './types';
export const defaultProps = {
options: {
- baseColor: BasicGaugeColor.Green,
minValue: 0,
maxValue: 100,
prefix: '',
diff --git a/public/app/plugins/panel/gauge/ValueOptions.tsx b/public/app/plugins/panel/gauge/ValueOptions.tsx
index 3bc529f0611..1fdccadddf2 100644
--- a/public/app/plugins/panel/gauge/ValueOptions.tsx
+++ b/public/app/plugins/panel/gauge/ValueOptions.tsx
@@ -1,6 +1,5 @@
import React, { PureComponent } from 'react';
-import { PanelOptionsProps, PanelOptionsGroup, Label, Select } from '@grafana/ui';
-
+import { FormField, FormLabel, PanelOptionsProps, PanelOptionsGroup, Select } from '@grafana/ui';
import UnitPicker from 'app/core/components/Select/UnitPicker';
import { GaugeOptions } from './types';
@@ -41,7 +40,7 @@ export default class ValueOptions extends PureComponent
-
+ Unit
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
);
}
diff --git a/public/app/plugins/panel/gauge/types.ts b/public/app/plugins/panel/gauge/types.ts
index b698a3389c2..42262178dc8 100644
--- a/public/app/plugins/panel/gauge/types.ts
+++ b/public/app/plugins/panel/gauge/types.ts
@@ -1,7 +1,6 @@
import { Threshold, ValueMapping } from '@grafana/ui';
export interface GaugeOptions {
- baseColor: string;
decimals: number;
valueMappings: ValueMapping[];
maxValue: number;
diff --git a/public/app/plugins/panel/graph2/GraphPanel.tsx b/public/app/plugins/panel/graph2/GraphPanel.tsx
index 28c17dbad2c..2fef35b4f5f 100644
--- a/public/app/plugins/panel/graph2/GraphPanel.tsx
+++ b/public/app/plugins/panel/graph2/GraphPanel.tsx
@@ -1,7 +1,6 @@
// Libraries
import _ from 'lodash';
import React, { PureComponent } from 'react';
-import { colors } from '@grafana/ui';
// Utils
import { processTimeSeries } from '@grafana/ui/src/utils';
@@ -23,7 +22,6 @@ export class GraphPanel extends PureComponent {
const vmSeries = processTimeSeries({
timeSeries: timeSeries,
nullValueMode: NullValueMode.Ignore,
- colorPalette: colors,
});
return (
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index b8e24616f0a..2618120e1fb 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -2,7 +2,7 @@ import _ from 'lodash';
import $ from 'jquery';
import 'vendor/flot/jquery.flot';
import 'vendor/flot/jquery.flot.gauge';
-import 'app/features/dashboard/panellinks/link_srv';
+import 'app/features/panel/panellinks/link_srv';
import kbn from 'app/core/utils/kbn';
import config from 'app/core/config';
diff --git a/public/app/plugins/panel/text/module.ts b/public/app/plugins/panel/text/module.ts
index 08ab4cd2b96..9c47b8bbe06 100644
--- a/public/app/plugins/panel/text/module.ts
+++ b/public/app/plugins/panel/text/module.ts
@@ -1,6 +1,8 @@
import _ from 'lodash';
import { PanelCtrl } from 'app/plugins/sdk';
import Remarkable from 'remarkable';
+import { sanitize } from 'app/core/utils/text';
+import config from 'app/core/config';
const defaultContent = `
# Title
@@ -33,11 +35,19 @@ export class TextPanelCtrl extends PanelCtrl {
this.events.on('refresh', this.onRefresh.bind(this));
this.events.on('render', this.onRender.bind(this));
+ const renderWhenChanged = (scope: any) => {
+ const { panel } = scope.ctrl;
+ return [
+ panel.content,
+ panel.mode
+ ].join();
+ };
+
$scope.$watch(
- 'ctrl.panel.content',
+ renderWhenChanged,
_.throttle(() => {
this.render();
- }, 1000)
+ }, 100)
);
}
@@ -62,7 +72,7 @@ export class TextPanelCtrl extends PanelCtrl {
this.renderingCompleted();
}
- renderText(content) {
+ renderText(content: string) {
content = content
.replace(/&/g, '&')
.replace(/>/g, '>')
@@ -71,7 +81,7 @@ export class TextPanelCtrl extends PanelCtrl {
this.updateContent(content);
}
- renderMarkdown(content) {
+ renderMarkdown(content: string) {
if (!this.remarkable) {
this.remarkable = new Remarkable();
}
@@ -81,7 +91,8 @@ export class TextPanelCtrl extends PanelCtrl {
});
}
- updateContent(html) {
+ updateContent(html: string) {
+ html = config.disableSanitizeHtml ? html : sanitize(html);
try {
this.content = this.$sce.trustAsHtml(this.templateSrv.replace(html, this.panel.scopedVars));
} catch (e) {
diff --git a/public/app/routes/routes.ts b/public/app/routes/routes.ts
index d3b3488f1fe..e7381740435 100644
--- a/public/app/routes/routes.ts
+++ b/public/app/routes/routes.ts
@@ -10,12 +10,16 @@ import ApiKeys from 'app/features/api-keys/ApiKeysPage';
import PluginListPage from 'app/features/plugins/PluginListPage';
import FolderSettingsPage from 'app/features/folders/FolderSettingsPage';
import FolderPermissions from 'app/features/folders/FolderPermissions';
+import CreateFolderCtrl from 'app/features/folders/CreateFolderCtrl';
+import FolderDashboardsCtrl from 'app/features/folders/FolderDashboardsCtrl';
+import DashboardImportCtrl from 'app/features/manage-dashboards/DashboardImportCtrl';
import DataSourcesListPage from 'app/features/datasources/DataSourcesListPage';
import NewDataSourcePage from '../features/datasources/NewDataSourcePage';
import UsersListPage from 'app/features/users/UsersListPage';
import DataSourceDashboards from 'app/features/datasources/DataSourceDashboards';
-import DataSourceSettings from '../features/datasources/settings/DataSourceSettings';
+import DataSourceSettingsPage from '../features/datasources/settings/DataSourceSettingsPage';
import OrgDetailsPage from '../features/org/OrgDetailsPage';
+import config from 'app/core/config';
/** @ngInject */
export function setupAngularRoutes($routeProvider, $locationProvider) {
@@ -65,8 +69,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
pageClass: 'page-dashboard',
})
.when('/dashboard/import', {
- templateUrl: 'public/app/features/dashboard/partials/dashboard_import.html',
- controller: 'DashboardImportCtrl',
+ templateUrl: 'public/app/features/manage-dashboards/partials/dashboard_import.html',
+ controller: DashboardImportCtrl,
controllerAs: 'ctrl',
})
.when('/datasources', {
@@ -78,7 +82,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
.when('/datasources/edit/:id/', {
template: '',
resolve: {
- component: () => DataSourceSettings,
+ component: () => DataSourceSettingsPage,
},
})
.when('/datasources/edit/:id/dashboards', {
@@ -99,8 +103,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controllerAs: 'ctrl',
})
.when('/dashboards/folder/new', {
- templateUrl: 'public/app/features/dashboard/partials/create_folder.html',
- controller: 'CreateFolderCtrl',
+ templateUrl: 'public/app/features/folders/partials/create_folder.html',
+ controller: CreateFolderCtrl,
controllerAs: 'ctrl',
})
.when('/dashboards/f/:uid/:slug/permissions', {
@@ -116,8 +120,8 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
},
})
.when('/dashboards/f/:uid/:slug', {
- templateUrl: 'public/app/features/dashboard/partials/folder_dashboards.html',
- controller: 'FolderDashboardsCtrl',
+ templateUrl: 'public/app/features/folders/partials/folder_dashboards.html',
+ controller: FolderDashboardsCtrl,
controllerAs: 'ctrl',
})
.when('/dashboards/f/:uid', {
@@ -129,7 +133,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
template: '',
reloadOnSearch: false,
resolve: {
- roles: () => ['Editor', 'Admin'],
+ roles: () => (config.viewersCanEdit ? [] : ['Editor', 'Admin']),
component: () => import(/* webpackChunkName: "explore" */ 'app/features/explore/Wrapper'),
},
})
diff --git a/public/app/types/datasources.ts b/public/app/types/datasources.ts
index 5670d762d77..729760b41ea 100644
--- a/public/app/types/datasources.ts
+++ b/public/app/types/datasources.ts
@@ -1,43 +1,15 @@
import { LayoutMode } from '../core/components/LayoutSelector/LayoutSelector';
-import { Plugin, PluginExports, PluginMeta } from './plugins';
-
-export interface DataSource {
- id: number;
- orgId: number;
- name: string;
- typeLogoUrl: string;
- type: string;
- access: string;
- url: string;
- password: string;
- user: string;
- database: string;
- basicAuth: boolean;
- basicAuthPassword: string;
- basicAuthUser: string;
- isDefault: boolean;
- jsonData: { authType: string; defaultRegion: string };
- readOnly: boolean;
- withCredentials: boolean;
- meta?: PluginMeta;
- pluginExports?: PluginExports;
-}
-
-export interface DataSourceSelectItem {
- name: string;
- value: string | null;
- meta: PluginMeta;
- sort: string;
-}
+import { Plugin } from './plugins';
+import { DataSourceSettings } from '@grafana/ui/src/types';
export interface DataSourcesState {
- dataSources: DataSource[];
+ dataSources: DataSourceSettings[];
searchQuery: string;
dataSourceTypeSearchQuery: string;
layoutMode: LayoutMode;
dataSourcesCount: number;
dataSourceTypes: Plugin[];
- dataSource: DataSource;
+ dataSource: DataSourceSettings;
dataSourceMeta: Plugin;
hasFetched: boolean;
}
diff --git a/public/app/types/explore.ts b/public/app/types/explore.ts
index 5636bb3acdb..34b7ff08c99 100644
--- a/public/app/types/explore.ts
+++ b/public/app/types/explore.ts
@@ -1,12 +1,9 @@
import { Value } from 'slate';
-import { RawTimeRange, TimeRange } from '@grafana/ui';
+import { RawTimeRange, TimeRange, DataQuery, DataSourceSelectItem, DataSourceApi, QueryHint } from '@grafana/ui';
import { Emitter } from 'app/core/core';
import { LogsModel } from 'app/core/logs_model';
import TableModel from 'app/core/table_model';
-import { DataSourceSelectItem } from 'app/types/datasources';
-
-import { DataQuery } from './series';
export interface CompletionItem {
/**
@@ -113,7 +110,11 @@ export interface ExploreItemState {
/**
* Datasource instance that has been selected. Datasource-specific logic can be run on this object.
*/
- datasourceInstance: any;
+ datasourceInstance: DataSourceApi | null;
+ /**
+ * Current data source name or null if default
+ */
+ requestedDatasourceName: string | null;
/**
* Error to be shown when datasource loading or testing failed.
*/
@@ -142,10 +143,6 @@ export interface ExploreItemState {
* History of recent queries. Datasource-specific and initialized via localStorage.
*/
history: HistoryItem[];
- /**
- * Initial datasource for this Explore, e.g., set via URL.
- */
- initialDatasource?: string;
/**
* Initial queries for this Explore, e.g., set via URL. Each query will be
* converted to a query row. Query edits should be tracked in `modifiedQueries` though.
@@ -184,12 +181,6 @@ export interface ExploreItemState {
* when query rows are removed.
*/
queryTransactions: QueryTransaction[];
- /**
- * Tracks datasource when selected in the datasource selector.
- * Allows the selection to be discarded if something went wrong during the asynchronous
- * loading of the datasource.
- */
- requestedDatasourceId?: number;
/**
* Time range for this Explore. Managed by the time picker and used by all query runs.
*/
@@ -246,9 +237,9 @@ export interface ExploreUrlState {
range: RawTimeRange;
}
-export interface HistoryItem {
+export interface HistoryItem {
ts: number;
- query: DataQuery;
+ query: TQuery;
}
export abstract class LanguageProvider {
@@ -276,28 +267,6 @@ export interface TypeaheadOutput {
suggestions: CompletionItemGroup[];
}
-export interface QueryFix {
- type: string;
- label: string;
- action?: QueryFixAction;
-}
-
-export interface QueryFixAction {
- type: string;
- query?: string;
- preventSubmit?: boolean;
-}
-
-export interface QueryHint {
- type: string;
- label: string;
- fix?: QueryFix;
-}
-
-export interface QueryHintGetter {
- (query: DataQuery, results: any[], ...rest: any): QueryHint[];
-}
-
export interface QueryIntervals {
interval: string;
intervalMs: number;
diff --git a/public/app/types/index.ts b/public/app/types/index.ts
index ad9f19e2c9f..f41183de7d4 100644
--- a/public/app/types/index.ts
+++ b/public/app/types/index.ts
@@ -1,90 +1,19 @@
-import { Team, TeamsState, TeamState, TeamGroup, TeamMember } from './teams';
-import { AlertRuleDTO, AlertRule, AlertRulesState } from './alerting';
-import { LocationState, LocationUpdate, UrlQueryMap, UrlQueryValue } from './location';
-import { NavModel, NavModelItem, NavIndex } from './navModel';
-import { FolderDTO, FolderState, FolderInfo } from './folders';
-import { DashboardState } from './dashboard';
-import { DashboardAcl, OrgRole, PermissionLevel } from './acl';
-import { ApiKey, ApiKeysState, NewApiKey } from './apiKeys';
-import { Invitee, OrgUser, User, UsersState, UserState } from './user';
-import { DataSource, DataSourceSelectItem, DataSourcesState } from './datasources';
-import { DataQuery, DataQueryResponse, DataQueryOptions } from './series';
-import { PluginDashboard, PluginMeta, Plugin, PanelPlugin, PluginsState } from './plugins';
-import { Organization, OrganizationState } from './organization';
-import {
- AppNotification,
- AppNotificationSeverity,
- AppNotificationsState,
- AppNotificationTimeout,
-} from './appNotifications';
-import { DashboardSearchHit } from './search';
-import { ValidationEvents, ValidationRule } from './form';
-import { ExploreState } from './explore';
-export {
- Team,
- TeamsState,
- TeamState,
- TeamGroup,
- TeamMember,
- AlertRuleDTO,
- AlertRule,
- AlertRulesState,
- LocationState,
- LocationUpdate,
- NavModel,
- NavModelItem,
- NavIndex,
- UrlQueryMap,
- UrlQueryValue,
- FolderDTO,
- FolderState,
- FolderInfo,
- DashboardState,
- DashboardAcl,
- OrgRole,
- PermissionLevel,
- DataSource,
- DataSourceSelectItem,
- PluginMeta,
- ApiKey,
- ApiKeysState,
- NewApiKey,
- Plugin,
- PluginsState,
- DataSourcesState,
- Invitee,
- OrgUser,
- User,
- UsersState,
- PanelPlugin,
- DataQuery,
- DataQueryResponse,
- DataQueryOptions,
- PluginDashboard,
- Organization,
- OrganizationState,
- AppNotification,
- AppNotificationsState,
- AppNotificationSeverity,
- AppNotificationTimeout,
- DashboardSearchHit,
- UserState,
- ValidationEvents,
- ValidationRule,
-};
+export * from './teams';
+export * from './alerting';
+export * from './location';
+export * from './navModel';
+export * from './folders';
+export * from './dashboard';
+export * from './acl';
+export * from './apiKeys';
+export * from './user';
+export * from './datasources';
+export * from './plugins';
+export * from './organization';
+export * from './appNotifications';
+export * from './search';
+export * from './form';
+export * from './explore';
+export * from './store';
+
-export interface StoreState {
- navIndex: NavIndex;
- location: LocationState;
- alertRules: AlertRulesState;
- teams: TeamsState;
- team: TeamState;
- folder: FolderState;
- dashboard: DashboardState;
- dataSources: DataSourcesState;
- explore: ExploreState;
- users: UsersState;
- organization: OrganizationState;
- appNotifications: AppNotificationsState;
- user: UserState;
-}
diff --git a/public/app/types/plugins.ts b/public/app/types/plugins.ts
index a1403c7a71c..cd608dc11e3 100644
--- a/public/app/types/plugins.ts
+++ b/public/app/types/plugins.ts
@@ -1,21 +1,4 @@
-import { ComponentClass } from 'react';
-import { PanelProps, PanelOptionsProps } from '@grafana/ui';
-
-export interface PluginExports {
- Datasource?: any;
- QueryCtrl?: any;
- ConfigCtrl?: any;
- AnnotationsQueryCtrl?: any;
- VariableQueryEditor?: any;
- ExploreQueryField?: any;
- ExploreStartPage?: any;
-
- // Panel plugin
- PanelCtrl?;
- Panel?: ComponentClass;
- PanelOptions?: ComponentClass;
- PanelDefaults?: any;
-}
+import { PluginExports, PluginMetaInfo } from '@grafana/ui/src/types';
export interface PanelPlugin {
id: string;
@@ -28,56 +11,6 @@ export interface PanelPlugin {
exports?: PluginExports;
}
-interface PluginMetaQueryOptions {
- cacheTimeout?: boolean;
- maxDataPoints?: boolean;
- minInterval?: boolean;
-}
-
-export interface PluginMeta {
- id: string;
- name: string;
- info: PluginMetaInfo;
- includes: PluginInclude[];
-
- // Datasource-specific
- metrics?: boolean;
- tables?: boolean;
- logs?: boolean;
- explore?: boolean;
- annotations?: boolean;
- mixed?: boolean;
- hasQueryHelp?: boolean;
- queryOptions?: PluginMetaQueryOptions;
-}
-
-export interface PluginInclude {
- type: string;
- name: string;
- path: string;
-}
-
-interface PluginMetaInfoLink {
- name: string;
- url: string;
-}
-
-export interface PluginMetaInfo {
- author: {
- name: string;
- url?: string;
- };
- description: string;
- links: PluginMetaInfoLink[];
- logos: {
- large: string;
- small: string;
- };
- screenshots: any[];
- updated: string;
- version: string;
-}
-
export interface Plugin {
defaultNavUrl: string;
enabled: boolean;
diff --git a/public/app/types/series.ts b/public/app/types/series.ts
deleted file mode 100644
index 9fe68955da5..00000000000
--- a/public/app/types/series.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { PluginMeta } from './plugins';
-import { TimeSeries, TimeRange, RawTimeRange } from '@grafana/ui';
-
-export interface DataQueryResponse {
- data: TimeSeries[];
-}
-
-export interface DataQuery {
- refId: string;
- [key: string]: any;
-}
-
-export interface DataQueryOptions {
- timezone: string;
- range: TimeRange;
- rangeRaw: RawTimeRange;
- targets: DataQuery[];
- panelId: number;
- dashboardId: number;
- cacheTimeout?: string;
- interval: string;
- intervalMs: number;
- maxDataPoints: number;
- scopedVars: object;
-}
-
-export interface DataSourceApi {
- /**
- * min interval range
- */
- interval?: string;
-
- /**
- * Imports queries from a different datasource
- */
- importQueries?(queries: DataQuery[], originMeta: PluginMeta): Promise;
-
- /**
- * Initializes a datasource after instantiation
- */
- init?: () => void;
-
- /**
- * Main metrics / data query action
- */
- query(options: DataQueryOptions): Promise;
-
- /**
- * Test & verify datasource settings & connection details
- */
- testDatasource(): Promise;
-}
diff --git a/public/app/types/store.ts b/public/app/types/store.ts
new file mode 100644
index 00000000000..0f5ad8cd088
--- /dev/null
+++ b/public/app/types/store.ts
@@ -0,0 +1,27 @@
+import { NavIndex } from './navModel';
+import { LocationState } from './location';
+import { AlertRulesState } from './alerting';
+import { TeamsState, TeamState } from './teams';
+import { FolderState } from './folders';
+import { DashboardState } from './dashboard';
+import { DataSourcesState } from './datasources';
+import { ExploreState } from './explore';
+import { UsersState, UserState } from './user';
+import { OrganizationState } from './organization';
+import { AppNotificationsState } from './appNotifications';
+
+export interface StoreState {
+ navIndex: NavIndex;
+ location: LocationState;
+ alertRules: AlertRulesState;
+ teams: TeamsState;
+ team: TeamState;
+ folder: FolderState;
+ dashboard: DashboardState;
+ dataSources: DataSourcesState;
+ explore: ExploreState;
+ users: UsersState;
+ organization: OrganizationState;
+ appNotifications: AppNotificationsState;
+ user: UserState;
+}
diff --git a/public/app/viz/Gauge.test.tsx b/public/app/viz/Gauge.test.tsx
deleted file mode 100644
index 69c7733f44b..00000000000
--- a/public/app/viz/Gauge.test.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import { BasicGaugeColor, TimeSeriesVMs } from '@grafana/ui';
-
-import { Gauge, Props } from './Gauge';
-
-jest.mock('jquery', () => ({
- plot: jest.fn(),
-}));
-
-const setup = (propOverrides?: object) => {
- const props: Props = {
- baseColor: BasicGaugeColor.Green,
- maxValue: 100,
- valueMappings: [],
- minValue: 0,
- prefix: '',
- showThresholdMarkers: true,
- showThresholdLabels: false,
- suffix: '',
- thresholds: [],
- unit: 'none',
- stat: 'avg',
- height: 300,
- width: 300,
- timeSeries: {} as TimeSeriesVMs,
- decimals: 0,
- };
-
- Object.assign(props, propOverrides);
-
- const wrapper = shallow();
- const instance = wrapper.instance() as Gauge;
-
- return {
- instance,
- wrapper,
- };
-};
-
-describe('Get font color', () => {
- it('should get base color if no threshold', () => {
- const { instance } = setup();
-
- expect(instance.getFontColor(40)).toEqual(BasicGaugeColor.Green);
- });
-
- it('should be f2f2f2', () => {
- const { instance } = setup({
- thresholds: [{ value: 59, color: '#f2f2f2' }],
- });
-
- expect(instance.getFontColor(58)).toEqual('#f2f2f2');
- });
-});
diff --git a/public/app/viz/state/timeSeries.ts b/public/app/viz/state/timeSeries.ts
deleted file mode 100644
index 5f27974a33b..00000000000
--- a/public/app/viz/state/timeSeries.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-// Libraries
-import _ from 'lodash';
-
-// Utils
-import { colors } from '@grafana/ui';
-
-// Types
-import { TimeSeries, TimeSeriesVMs, NullValueMode } from '@grafana/ui';
-
-interface Options {
- timeSeries: TimeSeries[];
- nullValueMode: NullValueMode;
-}
-
-export function getTimeSeriesVMs({ timeSeries, nullValueMode }: Options): TimeSeriesVMs {
- const vmSeries = timeSeries.map((item, index) => {
- const colorIndex = index % colors.length;
- const label = item.target;
- const result = [];
-
- // stat defaults
- let total = 0;
- let max = -Number.MAX_VALUE;
- let min = Number.MAX_VALUE;
- let logmin = Number.MAX_VALUE;
- let avg = null;
- let current = null;
- let first = null;
- let delta = 0;
- let diff = null;
- let range = null;
- let timeStep = Number.MAX_VALUE;
- let allIsNull = true;
- let allIsZero = true;
-
- const ignoreNulls = nullValueMode === NullValueMode.Ignore;
- const nullAsZero = nullValueMode === NullValueMode.AsZero;
-
- let currentTime;
- let currentValue;
- let nonNulls = 0;
- let previousTime;
- let previousValue = 0;
- let previousDeltaUp = true;
-
- for (let i = 0; i < item.datapoints.length; i++) {
- currentValue = item.datapoints[i][0];
- currentTime = item.datapoints[i][1];
-
- // Due to missing values we could have different timeStep all along the series
- // so we have to find the minimum one (could occur with aggregators such as ZimSum)
- if (previousTime !== undefined) {
- const currentStep = currentTime - previousTime;
- if (currentStep < timeStep) {
- timeStep = currentStep;
- }
- }
-
- previousTime = currentTime;
-
- if (currentValue === null) {
- if (ignoreNulls) {
- continue;
- }
- if (nullAsZero) {
- currentValue = 0;
- }
- }
-
- if (currentValue !== null) {
- if (_.isNumber(currentValue)) {
- total += currentValue;
- allIsNull = false;
- nonNulls++;
- }
-
- if (currentValue > max) {
- max = currentValue;
- }
-
- if (currentValue < min) {
- min = currentValue;
- }
-
- if (first === null) {
- first = currentValue;
- } else {
- if (previousValue > currentValue) {
- // counter reset
- previousDeltaUp = false;
- if (i === item.datapoints.length - 1) {
- // reset on last
- delta += currentValue;
- }
- } else {
- if (previousDeltaUp) {
- delta += currentValue - previousValue; // normal increment
- } else {
- delta += currentValue; // account for counter reset
- }
- previousDeltaUp = true;
- }
- }
- previousValue = currentValue;
-
- if (currentValue < logmin && currentValue > 0) {
- logmin = currentValue;
- }
-
- if (currentValue !== 0) {
- allIsZero = false;
- }
- }
-
- result.push([currentTime, currentValue]);
- }
-
- if (max === -Number.MAX_VALUE) {
- max = null;
- }
-
- if (min === Number.MAX_VALUE) {
- min = null;
- }
-
- if (result.length && !allIsNull) {
- avg = total / nonNulls;
- current = result[result.length - 1][1];
- if (current === null && result.length > 1) {
- current = result[result.length - 2][1];
- }
- }
-
- if (max !== null && min !== null) {
- range = max - min;
- }
-
- if (current !== null && first !== null) {
- diff = current - first;
- }
-
- const count = result.length;
-
- return {
- data: result,
- label: label,
- color: colors[colorIndex],
- stats: {
- total,
- min,
- max,
- current,
- logmin,
- avg,
- diff,
- delta,
- timeStep,
- range,
- count,
- first,
- allIsZero,
- allIsNull,
- },
- };
- });
-
- return vmSeries;
-}
diff --git a/public/sass/_grafana.scss b/public/sass/_grafana.scss
index e8859ff8255..739ccb6c412 100644
--- a/public/sass/_grafana.scss
+++ b/public/sass/_grafana.scss
@@ -32,12 +32,14 @@
@import 'utils/angular';
@import 'utils/spacings';
@import 'utils/widths';
+@import 'utils/hacks';
// LAYOUTS
@import 'layout/lists';
@import 'layout/page';
// COMPONENTS
+@import '../app/features/dashboard/components/AddPanelWidget/AddPanelWidget';
@import 'components/scrollbar';
@import 'components/cards';
@import 'components/buttons';
@@ -57,7 +59,6 @@
@import 'components/panel_table';
@import 'components/panel_text';
@import 'components/panel_heatmap';
-@import 'components/panel_add_panel';
@import 'components/panel_logs';
@import 'components/settings_permissions';
@import 'components/tagsinput';
diff --git a/public/sass/components/_footer.scss b/public/sass/components/_footer.scss
index 893eea02914..b5617f4e387 100644
--- a/public/sass/components/_footer.scss
+++ b/public/sass/components/_footer.scss
@@ -38,6 +38,14 @@
}
}
+.is-react .footer {
+ display: none;
+}
+
+.is-react .custom-scrollbars .footer {
+ display: block;
+}
+
// Keeping footer inside the graphic on Login screen
.login-page {
.footer {
diff --git a/public/sass/components/_panel_editor.scss b/public/sass/components/_panel_editor.scss
index b2ab91ccb19..b791231a242 100644
--- a/public/sass/components/_panel_editor.scss
+++ b/public/sass/components/_panel_editor.scss
@@ -35,6 +35,7 @@
flex-grow: 1;
background: $input-bg;
margin: 0 20px 0 84px;
+ width: calc(100% - 84px);
border-radius: 3px;
box-shadow: $panel-editor-shadow;
min-height: 0;
diff --git a/public/sass/components/_query_editor.scss b/public/sass/components/_query_editor.scss
index 8b876624294..b57e575dc5b 100644
--- a/public/sass/components/_query_editor.scss
+++ b/public/sass/components/_query_editor.scss
@@ -3,12 +3,6 @@
color: $blue;
}
-.gf-form-disabled {
- .query-keyword {
- color: darken($blue, 20%);
- }
-}
-
.query-segment-operator {
color: $orange;
}
@@ -18,12 +12,6 @@
}
.gf-form-query {
- display: flex;
- flex-direction: row;
- flex-wrap: nowrap;
- align-content: flex-start;
- align-items: flex-start;
-
.gf-form,
.gf-form-filler {
margin-bottom: 2px;
@@ -43,48 +31,6 @@
}
}
-.gf-form-query-content {
- flex-grow: 2;
-
- &--collapsed {
- overflow: hidden;
-
- .gf-form-label {
- overflow: hidden;
- text-overflow: ellipsis;
- width: 100%;
- white-space: nowrap;
- }
- }
-}
-
-.gf-form-query-letter-cell {
- flex-shrink: 0;
-
- .gf-form-query-letter-cell-carret {
- display: inline-block;
- width: 0.7rem;
- position: relative;
- left: -2px;
- }
- .gf-form-query-letter-cell-letter {
- font-weight: bold;
- color: $blue;
- }
- .gf-form-query-letter-cell-ds {
- color: $text-color-weak;
- }
-}
-
-.gf-query-ds-label {
- text-align: center;
- width: 44px;
-}
-
-.grafana-metric-options {
- margin-top: 25px;
-}
-
.tight-form-func {
background: $tight-form-func-bg;
@@ -136,28 +82,6 @@ input[type='text'].tight-form-func-param {
}
}
-.query-troubleshooter {
- font-size: $font-size-sm;
- margin: $gf-form-margin;
- border: 1px solid $btn-secondary-bg;
- min-height: 100px;
- border-radius: 3px;
-}
-
-.query-troubleshooter__header {
- float: right;
- font-size: $font-size-sm;
- text-align: right;
- padding: $input-padding-y $input-padding-x;
- a {
- margin-left: $spacer;
- }
-}
-
-.query-troubleshooter__body {
- padding: $spacer 0;
-}
-
.rst-text::before {
content: ' ';
}
@@ -188,3 +112,98 @@ input[type='text'].tight-form-func-param {
.rst-literal-block .rst-text {
display: block;
}
+
+.query-editor-row {
+ margin-bottom: 2px;
+
+ &:hover {
+ .query-editor-row__actions {
+ display: flex;
+ }
+ }
+
+ &--disabled {
+ .query-keyword {
+ color: darken($blue, 20%);
+ }
+ }
+
+}
+
+.query-editor-row__header {
+ display: flex;
+ padding: 4px 0px 4px 8px;
+ position: relative;
+ height: 35px;
+ background: $page-bg;
+ flex-wrap: nowrap;
+ align-items: center;
+
+}
+.query-editor-row__ref-id {
+ font-weight: $font-weight-semi-bold;
+ color: $blue;
+ font-size: $font-size-md;
+ cursor: pointer;
+ display: flex;
+ align-items: center;
+
+ i {
+ padding-right: 5px;
+ color: $text-muted;
+ position: relative;
+ }
+}
+
+.query-editor-row__collapsed-text {
+ padding: 0 10px;
+ display: flex;
+ align-items: center;
+ flex-grow: 1;
+ overflow: hidden;
+
+ > div {
+ color: $text-muted;
+ font-style: italic;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ font-size: $font-size-sm;
+ min-width: 0;
+ }
+}
+
+.query-editor-row__actions {
+ flex-shrink: 0;
+ display: flex;
+ justify-content: flex-end;
+ color: $text-muted;
+}
+
+.query-editor-row__action {
+ margin-left: 3px;
+ background: transparent;
+ border: none;
+ box-shadow: none;
+
+ &:hover {
+ color: $text-color;
+ }
+}
+
+.query-editor-row__body {
+ margin: 2px 0 10px 40px;
+ background: $page-bg;
+
+ &--collapsed {
+ display: none;
+ }
+}
+
+.query-editor-row__context-info {
+ font-style: italic;
+ font-size: $font-size-sm;
+ color: $text-muted;
+ padding-left: 10px;
+}
+
diff --git a/public/sass/components/_scrollbar.scss b/public/sass/components/_scrollbar.scss
index a7ecb73b786..d57e90bce32 100644
--- a/public/sass/components/_scrollbar.scss
+++ b/public/sass/components/_scrollbar.scss
@@ -106,80 +106,79 @@
opacity: 0.9;
}
-// // Scrollbars
-// //
-//
-// ::-webkit-scrollbar {
-// width: 8px;
-// height: 8px;
-// }
-//
-// ::-webkit-scrollbar:hover {
-// height: 8px;
-// }
-//
-// ::-webkit-scrollbar-button:start:decrement,
-// ::-webkit-scrollbar-button:end:increment {
-// display: none;
-// }
-// ::-webkit-scrollbar-button:horizontal:decrement {
-// display: none;
-// }
-// ::-webkit-scrollbar-button:horizontal:increment {
-// display: none;
-// }
-// ::-webkit-scrollbar-button:vertical:decrement {
-// display: none;
-// }
-// ::-webkit-scrollbar-button:vertical:increment {
-// display: none;
-// }
-// ::-webkit-scrollbar-button:horizontal:decrement:active {
-// background-image: none;
-// }
-// ::-webkit-scrollbar-button:horizontal:increment:active {
-// background-image: none;
-// }
-// ::-webkit-scrollbar-button:vertical:decrement:active {
-// background-image: none;
-// }
-// ::-webkit-scrollbar-button:vertical:increment:active {
-// background-image: none;
-// }
-// ::-webkit-scrollbar-track-piece {
-// background-color: transparent;
-// }
-//
-// ::-webkit-scrollbar-thumb:vertical {
-// height: 50px;
-// background: -webkit-gradient(
-// linear,
-// left top,
-// right top,
-// color-stop(0%, $scrollbarBackground),
-// color-stop(100%, $scrollbarBackground2)
-// );
-// border: 1px solid $scrollbarBorder;
-// border-top: 1px solid $scrollbarBorder;
-// border-left: 1px solid $scrollbarBorder;
-// }
-//
-// ::-webkit-scrollbar-thumb:horizontal {
-// width: 50px;
-// background: -webkit-gradient(
-// linear,
-// left top,
-// left bottom,
-// color-stop(0%, $scrollbarBackground),
-// color-stop(100%, $scrollbarBackground2)
-// );
-// border: 1px solid $scrollbarBorder;
-// border-top: 1px solid $scrollbarBorder;
-// border-left: 1px solid $scrollbarBorder;
-// }
-//
-// Baron styles
+// Scrollbars
+.no-overlay-scrollbar {
+ ::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+ }
+ ::-webkit-scrollbar:hover {
+ height: 8px;
+ }
+
+ ::-webkit-scrollbar-button:start:decrement,
+ ::-webkit-scrollbar-button:end:increment {
+ display: none;
+ }
+ ::-webkit-scrollbar-button:horizontal:decrement {
+ display: none;
+ }
+ ::-webkit-scrollbar-button:horizontal:increment {
+ display: none;
+ }
+ ::-webkit-scrollbar-button:vertical:decrement {
+ display: none;
+ }
+ ::-webkit-scrollbar-button:vertical:increment {
+ display: none;
+ }
+ ::-webkit-scrollbar-button:horizontal:decrement:active {
+ background-image: none;
+ }
+ ::-webkit-scrollbar-button:horizontal:increment:active {
+ background-image: none;
+ }
+ ::-webkit-scrollbar-button:vertical:decrement:active {
+ background-image: none;
+ }
+ ::-webkit-scrollbar-button:vertical:increment:active {
+ background-image: none;
+ }
+ ::-webkit-scrollbar-track-piece {
+ background-color: transparent;
+ }
+
+ ::-webkit-scrollbar-thumb:vertical {
+ height: 50px;
+ background: -webkit-gradient(
+ linear,
+ left top,
+ right top,
+ color-stop(0%, $scrollbarBackground),
+ color-stop(100%, $scrollbarBackground2)
+ );
+ border: 1px solid $scrollbarBorder;
+ border-top: 1px solid $scrollbarBorder;
+ border-left: 1px solid $scrollbarBorder;
+ }
+
+ ::-webkit-scrollbar-thumb:horizontal {
+ width: 50px;
+ background: -webkit-gradient(
+ linear,
+ left top,
+ left bottom,
+ color-stop(0%, $scrollbarBackground),
+ color-stop(100%, $scrollbarBackground2)
+ );
+ border: 1px solid $scrollbarBorder;
+ border-top: 1px solid $scrollbarBorder;
+ border-left: 1px solid $scrollbarBorder;
+ }
+}
+
+// Baron styles
.baron {
// display: inline-block; // this brakes phantomjs rendering (width becomes 0)
overflow: hidden;
diff --git a/public/sass/components/_sidemenu.scss b/public/sass/components/_sidemenu.scss
index 237574b93bc..44941540598 100644
--- a/public/sass/components/_sidemenu.scss
+++ b/public/sass/components/_sidemenu.scss
@@ -149,6 +149,19 @@
color: #ebedf2;
}
+.side-menu-header-link {
+ // Removes left-brand-border-gradient from link
+ color: #ebedf2 !important;
+ border: none !important;
+ padding: 0 !important;
+}
+
+.dropdown-menu--sidemenu > li > .side-menu-header-link:hover {
+ // Makes sure it looks good on light theme
+ color: #fff !important;
+ background-color: $side-menu-item-hover-bg !important;
+}
+
.sidemenu-subtitle {
padding: 0.5rem 1rem 0.5rem;
font-size: $font-size-sm;
diff --git a/public/sass/components/_toolbar.scss b/public/sass/components/_toolbar.scss
index 5f557f89cad..14db85f7e65 100644
--- a/public/sass/components/_toolbar.scss
+++ b/public/sass/components/_toolbar.scss
@@ -16,6 +16,12 @@
padding-right: 20px;
}
+.toolbar__left {
+ display: flex;
+ flex-grow: 1;
+ align-items: center;
+}
+
.toolbar__main {
padding: 0 $input-padding-x;
font-size: $font-size-md;
diff --git a/public/sass/layout/_page.scss b/public/sass/layout/_page.scss
index 818dc6c3e60..425cbc903c0 100644
--- a/public/sass/layout/_page.scss
+++ b/public/sass/layout/_page.scss
@@ -20,7 +20,23 @@
}
}
+.page-scrollbar-wrapper {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ width: 100%;
+}
+
+.page-scrollbar-content {
+ display: flex;
+ min-height: 100%;
+ flex-direction: column;
+ width: 100%;
+}
+
.page-container {
+ flex-grow: 1;
+ width: 100%;
margin-left: auto;
margin-right: auto;
padding-left: $spacer*2;
@@ -78,7 +94,6 @@
.page-body {
padding-top: $spacer*2;
- min-height: 500px;
}
.page-heading {
diff --git a/public/sass/pages/_explore.scss b/public/sass/pages/_explore.scss
index abd13a10368..dce944dc7b2 100644
--- a/public/sass/pages/_explore.scss
+++ b/public/sass/pages/_explore.scss
@@ -1,182 +1,324 @@
-.explore {
- flex: 1 1 auto;
+.icon-margin-right {
+ margin-right: 0.25em;
+}
- &-container {
- padding: $dashboard-padding;
+.icon-margin-left {
+ margin-left: 0.25em;
+}
+
+.run-icon {
+ transform: rotate(90deg);
+}
+
+.timepicker {
+ display: flex;
+}
+
+.timepicker-rangestring {
+ margin-left: 0.5em;
+}
+
+.datasource-picker {
+ .ds-picker {
+ min-width: 200px;
+ max-width: 200px;
+ }
+}
+
+.sidemenu-open {
+ .explore-toolbar-header {
+ padding: 0;
+ margin-left: 0;
}
- &-wrapper {
- display: flex;
-
- > .explore-split {
- width: 50%;
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
}
}
+}
- // Push split button a bit
- .explore-first-button {
- margin-left: 15px;
+.explore-toolbar {
+ background: inherit;
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: flex-start;
+ height: auto;
+ padding: 0px $dashboard-padding;
+ border-bottom: 1px solid #0000;
+ transition-duration: 0.35s;
+ transition-timing-function: ease-in-out;
+ transition-property: box-shadow, border-bottom;
+}
+
+.explore-toolbar-item {
+ position: relative;
+ align-self: center;
+}
+
+.explore-toolbar.splitted {
+ .explore-toolbar-item {
+ flex: 1 1 100%;
}
- .explore-panel {
- margin-top: $panel-margin;
+ .explore-toolbar-content-item:first-child {
+ padding-left: 0;
+ margin-right: auto;
}
+}
- .explore-panel__body {
- padding: $panel-padding;
- }
+.explore-toolbar-item:last-child {
+ flex: auto;
+}
- .explore-panel__header {
- padding: $panel-padding;
- padding-top: 5px;
- padding-bottom: 0;
- display: flex;
- cursor: pointer;
- margin-bottom: 5px;
- transition: all 0.1s linear;
- }
+.explore-toolbar-header {
+ display: flex;
+ flex: 1 1 0;
+ flex-flow: row nowrap;
+ font-size: 18px;
+ min-height: 55px;
+ line-height: 55px;
+ justify-content: space-between;
+ margin-left: $panel-margin * 3;
+}
- .explore-panel__header-label {
- font-weight: 500;
- margin-right: $panel-margin;
- font-size: $font-size-h6;
- box-shadow: $text-shadow-faint;
- }
+.explore-toolbar-header {
+ justify-content: space-between;
+ align-items: center;
+}
- .explore-panel__header-buttons {
- margin-right: $panel-margin;
- font-size: $font-size-lg;
- line-height: $font-size-h6;
- }
-
- // Make sure wrap buttons around on small screens
- .navbar {
- flex-wrap: wrap;
- height: auto;
- }
+.explore-toolbar-header-title {
+ color: darken($link-color, 5%);
.navbar-page-btn {
- margin-right: 1rem;
+ padding-left: $dashboard-padding;
+ }
- // Explore icon in header
- .fa {
- font-size: 100%;
- opacity: 0.75;
- margin-right: 0.5em;
+ .fa {
+ font-size: 100%;
+ opacity: 0.75;
+ margin-right: 0.5em;
+ }
+}
+
+.explore-toolbar-header-close {
+ margin-left: auto;
+}
+
+.explore-toolbar-content {
+ display: flex;
+ flex-flow: row wrap;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.explore-toolbar-content-item {
+ padding: 10px 2px;
+}
+
+.explore-toolbar-content-item:first-child {
+ padding-left: $dashboard-padding;
+ margin-right: auto;
+}
+
+@media only screen and (max-width: 1545px) {
+ .explore-toolbar.splitted {
+ .timepicker-rangestring {
+ display: none;
}
}
+}
- // Toggle mode
- .navbar-button.active {
- color: $btn-active-text-color;
- background-color: $btn-active-bg;
- }
-
- .navbar-button--no-icon {
- line-height: 18px;
- }
-
- .result-options {
- margin: 2 * $panel-margin 0;
- }
-
- .time-series-disclaimer {
- width: 300px;
- margin: $panel-margin auto;
- padding: 10px 0;
- border-radius: $border-radius;
- text-align: center;
- background-color: $panel-bg;
-
- .disclaimer-icon {
- color: $yellow;
- margin-right: $panel-margin/2;
- }
-
- .show-all-time-series {
- cursor: pointer;
- color: $external-link-color;
- }
- }
-
- .navbar .elapsed-time {
- position: absolute;
- left: 0;
- right: 0;
- top: 3.5rem;
- text-align: center;
- font-size: 0.8rem;
- }
-
- .graph-legend {
- flex-wrap: wrap;
- }
-
- .explore-panel__loader {
- height: 2px;
- position: relative;
- overflow: hidden;
- background: none;
- margin: $panel-margin / 2;
- transition: background-color 1s ease;
- }
-
- .explore-panel__loader--active {
- background: $text-color-faint;
- }
-
- .explore-panel__loader--active:after {
- content: ' ';
- display: block;
- width: 25%;
- top: 0;
- top: -50%;
- height: 250%;
- position: absolute;
- animation: loader 2s cubic-bezier(0.17, 0.67, 0.83, 0.67);
- animation-iteration-count: 100;
- background: $blue;
- }
-
- @keyframes loader {
- from {
- left: -25%;
- }
- to {
- left: 100%;
- }
- }
-
- .datasource-picker {
- min-width: 200px;
- }
-
+@media only screen and (max-width: 1070px) {
.timepicker {
- display: flex;
-
- &-rangestring {
- margin-left: 0.5em;
+ .timepicker-rangestring {
+ display: none;
}
}
- .run-icon {
- margin-left: 0.25em;
- transform: rotate(90deg);
+ .explore-toolbar-content {
+ justify-content: flex-start;
}
- .relative {
- position: relative;
+ .explore-toolbar.splitted {
+ .explore-toolbar-content-item {
+ padding: 2px 0;
+ margin: 0;
+ }
}
- .link {
- text-decoration: underline;
+ .explore-toolbar-content-item {
+ padding: 2px 2px;
}
}
+@media only screen and (max-width: 803px) {
+ .sidemenu-open {
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: 0;
+ }
+ }
+ }
+
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+
+ .btn-title {
+ display: none;
+ }
+}
+
+@media only screen and (max-width: 702px) {
+ .explore-toolbar-content-item:first-child {
+ padding-left: 2px;
+ margin-right: 0;
+ }
+}
+
+@media only screen and (max-width: 544px) {
+ .sidemenu-open {
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+ }
+
+ .explore-toolbar-header-title {
+ .navbar-page-btn {
+ padding-left: 0;
+ margin-left: $dashboard-padding;
+ }
+ }
+}
+
+.explore {
+ flex: 1 1 auto;
+}
+
.explore + .explore {
border-left: 1px dotted $table-border;
}
+.explore-container {
+ padding: $dashboard-padding;
+}
+
+.explore-wrapper {
+ display: flex;
+
+ > .explore-split {
+ width: 50%;
+ }
+}
+
+.explore-panel {
+ margin-top: $panel-margin;
+}
+
+.explore-panel__body {
+ padding: $panel-padding;
+}
+
+.explore-panel__header {
+ padding: $panel-padding;
+ padding-top: 5px;
+ padding-bottom: 0;
+ display: flex;
+ cursor: pointer;
+ margin-bottom: 5px;
+ transition: all 0.1s linear;
+}
+
+.explore-panel__header-label {
+ font-weight: 500;
+ margin-right: $panel-margin;
+ font-size: $font-size-h6;
+ box-shadow: $text-shadow-faint;
+}
+
+.explore-panel__header-buttons {
+ margin-right: $panel-margin;
+ font-size: $font-size-lg;
+ line-height: $font-size-h6;
+}
+
+.result-options {
+ margin: 2 * $panel-margin 0;
+}
+
+.time-series-disclaimer {
+ width: 300px;
+ margin: $panel-margin auto;
+ padding: 10px 0;
+ border-radius: $border-radius;
+ text-align: center;
+ background-color: $panel-bg;
+
+ .disclaimer-icon {
+ color: $yellow;
+ margin-right: $panel-margin/2;
+ }
+
+ .show-all-time-series {
+ cursor: pointer;
+ color: $external-link-color;
+ }
+}
+
+.navbar .elapsed-time {
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 3.5rem;
+ text-align: center;
+ font-size: 0.8rem;
+}
+
+.graph-legend {
+ flex-wrap: wrap;
+}
+
+.explore-panel__loader {
+ height: 2px;
+ position: relative;
+ overflow: hidden;
+ background: none;
+ margin: $panel-margin / 2;
+}
+
+.explore-panel__loader--active:after {
+ content: ' ';
+ display: block;
+ width: 25%;
+ top: 0;
+ top: -50%;
+ height: 250%;
+ position: absolute;
+ animation: loader 2s cubic-bezier(0.17, 0.67, 0.83, 0.67) 500ms;
+ animation-iteration-count: 100;
+ left: -25%;
+ background: $blue;
+}
+
+@keyframes loader {
+ from {
+ left: -25%;
+ opacity: 0.1;
+ }
+ to {
+ left: 100%;
+ opacity: 1;
+ }
+}
+
.query-row {
display: flex;
position: relative;
diff --git a/public/sass/utils/_hacks.scss b/public/sass/utils/_hacks.scss
new file mode 100644
index 00000000000..25cc324aa64
--- /dev/null
+++ b/public/sass/utils/_hacks.scss
@@ -0,0 +1,11 @@
+// <3: https://medium.com/@brunn/detecting-autofilled-fields-in-javascript-aed598d25da7
+// sass-lint:disable no-empty-rulesets
+@keyframes onAutoFillStart { from {/**/} to {/**/}}
+@keyframes onAutoFillCancel { from {/**/} to {/**/}}
+input:-webkit-autofill {
+ animation-name: onAutoFillStart;
+ transition: transform 1ms;
+}
+input:not(:-webkit-autofill) {
+ animation-name: onAutoFillCancel;
+}
\ No newline at end of file
diff --git a/public/test/helpers/getQueryOptions.ts b/public/test/helpers/getQueryOptions.ts
new file mode 100644
index 00000000000..ac92c2afb55
--- /dev/null
+++ b/public/test/helpers/getQueryOptions.ts
@@ -0,0 +1,25 @@
+import { DataQueryOptions, DataQuery } from '@grafana/ui';
+import moment from 'moment';
+
+
+export function getQueryOptions(options: Partial>): DataQueryOptions {
+ const raw = {from: 'now', to: 'now-1h'};
+ const range = { from: moment(), to: moment(), raw: raw};
+
+ const defaults: DataQueryOptions = {
+ range: range,
+ rangeRaw: raw,
+ targets: [],
+ scopedVars: {},
+ timezone: 'browser',
+ panelId: 1,
+ dashboardId: 1,
+ interval: '60s',
+ intervalMs: 60000,
+ maxDataPoints: 500,
+ };
+
+ Object.assign(defaults, options);
+
+ return defaults;
+}
diff --git a/public/vendor/flot/jquery.flot.pie.js b/public/vendor/flot/jquery.flot.pie.js
index 6553c8ea3a8..dee47e6e504 100644
--- a/public/vendor/flot/jquery.flot.pie.js
+++ b/public/vendor/flot/jquery.flot.pie.js
@@ -73,6 +73,7 @@ More detail and specific examples can be found in the included HTML file.
centerLeft = null,
centerTop = null,
processed = false,
+ options = null,
ctx = null;
// interactive variables
diff --git a/scripts/build/build-all.sh b/scripts/build/build-all.sh
index 980ef5cc4c2..411e00a1646 100755
--- a/scripts/build/build-all.sh
+++ b/scripts/build/build-all.sh
@@ -30,9 +30,13 @@ fi
echo "Build arguments: $OPT"
-go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
-go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
-go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
+# build only amd64 for enterprise
+if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
+ go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
+ go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
+ go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
+fi
go run build.go -goos windows -cc ${CCWIN64} ${OPT} build
@@ -62,22 +66,27 @@ echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
#removing amd64 phantomjs bin for armv7/arm64 packages
rm tools/phantomjs/phantomjs
-go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
-go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
-if [ -d '/tmp/phantomjs/darwin' ]; then
- cp /tmp/phantomjs/darwin/phantomjs tools/phantomjs/phantomjs
-else
- echo 'PhantomJS binaries for darwin missing!'
+# build only amd64 for enterprise
+if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
+ go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
+ go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
+ go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
+
+ if [ -d '/tmp/phantomjs/darwin' ]; then
+ cp /tmp/phantomjs/darwin/phantomjs tools/phantomjs/phantomjs
+ else
+ echo 'PhantomJS binaries for darwin missing!'
+ fi
+ go run build.go -goos darwin -pkg-arch amd64 ${OPT} package-only
fi
-go run build.go -goos darwin -pkg-arch amd64 ${OPT} package-only
if [ -d '/tmp/phantomjs/windows' ]; then
cp /tmp/phantomjs/windows/phantomjs.exe tools/phantomjs/phantomjs.exe
- rm tools/phantomjs/phantomjs
+ rm tools/phantomjs/phantomjs || true
else
echo 'PhantomJS binaries for Windows missing!'
fi
go run build.go -goos windows -pkg-arch amd64 ${OPT} package-only
-go run build.go latest
\ No newline at end of file
+go run build.go latest
diff --git a/scripts/build/build.sh b/scripts/build/build.sh
index ac6aab0b867..5f42744082a 100755
--- a/scripts/build/build.sh
+++ b/scripts/build/build.sh
@@ -28,6 +28,7 @@ fi
echo "Build arguments: $OPT"
+go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
@@ -49,6 +50,7 @@ source /etc/profile.d/rvm.sh
echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
+go run build.go -goos linux -pkg-arch armv6 ${OPT} -skipRpm package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
diff --git a/scripts/build/ci-deploy/Dockerfile b/scripts/build/ci-deploy/Dockerfile
index f6683f9663c..dd4987b96c3 100644
--- a/scripts/build/ci-deploy/Dockerfile
+++ b/scripts/build/ci-deploy/Dockerfile
@@ -8,8 +8,6 @@ RUN git clone https://github.com/aptly-dev/aptly $GOPATH/src/github.com/aptly-de
FROM circleci/python:2.7-stretch
-ENV PATH=$PATH:/opt/google-cloud-sdk/bin
-
USER root
RUN pip install awscli && \
@@ -18,7 +16,9 @@ RUN pip install awscli && \
apt update && \
apt install -y createrepo expect && \
apt-get autoremove -y && \
- rm -rf /var/lib/apt/lists/*
+ rm -rf /var/lib/apt/lists/* && \
+ ln -s /opt/google-cloud-sdk/bin/gsutil /usr/bin/gsutil && \
+ ln -s /opt/google-cloud-sdk/bin/gcloud /usr/bin/gcloud
COPY --from=0 /go/bin/aptly /usr/local/bin/aptly
diff --git a/scripts/build/ci-deploy/build-deploy.sh b/scripts/build/ci-deploy/build-deploy.sh
index 818f91013ac..8dedeead009 100755
--- a/scripts/build/ci-deploy/build-deploy.sh
+++ b/scripts/build/ci-deploy/build-deploy.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-_version="1.1.0"
+_version="1.2.0"
_tag="grafana/grafana-ci-deploy:${_version}"
docker build -t $_tag .
diff --git a/scripts/build/publish.go b/scripts/build/publish.go
deleted file mode 100644
index d5b19877724..00000000000
--- a/scripts/build/publish.go
+++ /dev/null
@@ -1,194 +0,0 @@
-package main
-
-import (
- "bytes"
- "encoding/json"
- "flag"
- "fmt"
- "io/ioutil"
- "log"
- "net/http"
- "os"
- "path/filepath"
- "regexp"
- "strings"
- "time"
-)
-
-var apiUrl = flag.String("apiUrl", "https://grafana.com/api", "api url")
-var apiKey = flag.String("apiKey", "", "api key")
-var version = ""
-var versionRe = regexp.MustCompile(`grafana-(.*)(\.|_)(arm64|armhfp|aarch64|armv7|darwin|linux|windows|x86_64)`)
-var debVersionRe = regexp.MustCompile(`grafana_(.*)_(arm64|armv7|armhf|amd64)\.deb`)
-var builds = []build{}
-var architectureMapping = map[string]string{
- "armv7": "armv7",
- "armhfp": "armv7",
- "armhf": "armv7",
- "arm64": "arm64",
- "aarch64": "arm64",
- "amd64": "amd64",
- "x86_64": "amd64",
-}
-
-func main() {
- flag.Parse()
- if *apiKey == "" {
- log.Fatalf("Require apiKey command line parameters")
- }
-
- err := filepath.Walk("dist", packageWalker)
- if err != nil {
- log.Fatalf("Cannot find any packages to publish, %v", err)
- }
-
- if version == "" {
- log.Fatalf("No version found")
- }
-
- if len(builds) == 0 {
- log.Fatalf("No builds found")
- }
-
- nightly := release{
- Version: version,
- ReleaseDate: time.Now(),
- Stable: false,
- Nightly: true,
- Beta: false,
- WhatsNewUrl: "",
- ReleaseNotesUrl: "",
- Builds: builds,
- }
-
- postRequest("/grafana/versions", nightly, fmt.Sprintf("Create Release %s", nightly.Version))
- postRequest("/grafana/versions/"+nightly.Version, nightly, fmt.Sprintf("Update Release %s", nightly.Version))
-
- for _, b := range nightly.Builds {
- postRequest(fmt.Sprintf("/grafana/versions/%s/packages", nightly.Version), b, fmt.Sprintf("Create Build %s %s", b.Os, b.Arch))
- postRequest(fmt.Sprintf("/grafana/versions/%s/packages/%s/%s", nightly.Version, b.Arch, b.Os), b, fmt.Sprintf("Update Build %s %s", b.Os, b.Arch))
- }
-}
-
-func mapPackage(path string, name string, shaBytes []byte) (build, error) {
- log.Printf("Finding package file %s", name)
- result := versionRe.FindSubmatch([]byte(name))
- debResult := debVersionRe.FindSubmatch([]byte(name))
-
- if len(result) > 0 {
- version = string(result[1])
- log.Printf("Version detected: %v", version)
- } else if len(debResult) > 0 {
- version = string(debResult[1])
- } else {
- return build{}, fmt.Errorf("Unable to figure out version from '%v'", name)
- }
-
- os := ""
- if strings.Contains(name, "linux") {
- os = "linux"
- }
- if strings.HasSuffix(name, "windows-amd64.zip") {
- os = "win"
- }
- if strings.HasSuffix(name, "darwin-amd64.tar.gz") {
- os = "darwin"
- }
- if strings.HasSuffix(name, ".rpm") {
- os = "rhel"
- }
- if strings.HasSuffix(name, ".deb") {
- os = "deb"
- }
- if os == "" {
- return build{}, fmt.Errorf("Unable to figure out os from '%v'", name)
- }
-
- arch := ""
- for archListed, archReal := range architectureMapping {
- if strings.Contains(name, archListed) {
- arch = archReal
- break
- }
- }
- if arch == "" {
- return build{}, fmt.Errorf("Unable to figure out arch from '%v'", name)
- }
-
- return build{
- Os: os,
- Arch: arch,
- Url: "https://s3-us-west-2.amazonaws.com/grafana-releases/master/" + name,
- Sha256: string(shaBytes),
- }, nil
-}
-
-func packageWalker(path string, f os.FileInfo, err error) error {
- if err != nil {
- log.Printf("error: %v", err)
- }
- if f.Name() == "dist" || strings.Contains(f.Name(), "sha256") || strings.Contains(f.Name(), "latest") {
- return nil
- }
-
- shaBytes, err := ioutil.ReadFile(path + ".sha256")
- if err != nil {
- log.Fatalf("Failed to read sha256 file %v", err)
- }
-
- build, err := mapPackage(path, f.Name(), shaBytes)
- if err != nil {
- log.Printf("Could not map metadata from package: %v", err)
- return nil
- }
-
- builds = append(builds, build)
- return nil
-}
-
-func postRequest(url string, obj interface{}, desc string) {
- jsonBytes, _ := json.Marshal(obj)
- req, _ := http.NewRequest(http.MethodPost, (*apiUrl)+url, bytes.NewReader(jsonBytes))
- req.Header.Add("Authorization", "Bearer "+(*apiKey))
- req.Header.Add("Content-Type", "application/json")
-
- res, err := http.DefaultClient.Do(req)
- if err != nil {
- log.Fatalf("error: %v", err)
- }
-
- if res.StatusCode == http.StatusOK {
- log.Printf("Action: %s \t OK", desc)
- } else {
-
- if res.Body != nil {
- defer res.Body.Close()
- body, _ := ioutil.ReadAll(res.Body)
- if strings.Contains(string(body), "already exists") || strings.Contains(string(body), "Nothing to update") {
- log.Printf("Action: %s \t Already exists", desc)
- } else {
- log.Printf("Action: %s \t Failed - Status: %v", desc, res.Status)
- log.Printf("Resp: %s", body)
- log.Fatalf("Quitting")
- }
- }
- }
-}
-
-type release struct {
- Version string `json:"version"`
- ReleaseDate time.Time `json:"releaseDate"`
- Stable bool `json:"stable"`
- Beta bool `json:"beta"`
- Nightly bool `json:"nightly"`
- WhatsNewUrl string `json:"whatsNewUrl"`
- ReleaseNotesUrl string `json:"releaseNotesUrl"`
- Builds []build `json:"-"`
-}
-
-type build struct {
- Os string `json:"os"`
- Url string `json:"url"`
- Sha256 string `json:"sha256"`
- Arch string `json:"arch"`
-}
diff --git a/scripts/build/release_publisher/externalrelease.go b/scripts/build/release_publisher/externalrelease.go
index 992cba38f90..64e879cace4 100644
--- a/scripts/build/release_publisher/externalrelease.go
+++ b/scripts/build/release_publisher/externalrelease.go
@@ -14,10 +14,10 @@ type releaseFromExternalContent struct {
artifactConfigurations []buildArtifact
}
-func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error) {
+func (re releaseFromExternalContent) prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error) {
version := re.rawVersion[1:]
beta := strings.Contains(version, "beta")
- var rt ReleaseType
+ var rt releaseType
if beta {
rt = BETA
} else if nightly {
@@ -28,11 +28,11 @@ func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl
builds := []build{}
for _, ba := range re.artifactConfigurations {
- sha256, err := re.getter.getContents(fmt.Sprintf("%s.sha256", ba.getUrl(baseArchiveUrl, version, rt)))
+ sha256, err := re.getter.getContents(fmt.Sprintf("%s.sha256", ba.getURL(baseArchiveURL, version, rt)))
if err != nil {
return nil, err
}
- builds = append(builds, newBuild(baseArchiveUrl, ba, version, rt, sha256))
+ builds = append(builds, newBuild(baseArchiveURL, ba, version, rt, sha256))
}
r := release{
@@ -41,8 +41,8 @@ func (re releaseFromExternalContent) prepareRelease(baseArchiveUrl, whatsNewUrl
Stable: rt.stable(),
Beta: rt.beta(),
Nightly: rt.nightly(),
- WhatsNewUrl: whatsNewUrl,
- ReleaseNotesUrl: releaseNotesUrl,
+ WhatsNewURL: whatsNewURL,
+ ReleaseNotesURL: releaseNotesURL,
Builds: builds,
}
return &r, nil
@@ -52,9 +52,9 @@ type urlGetter interface {
getContents(url string) (string, error)
}
-type getHttpContents struct{}
+type getHTTPContents struct{}
-func (getHttpContents) getContents(url string) (string, error) {
+func (getHTTPContents) getContents(url string) (string, error) {
response, err := http.Get(url)
if err != nil {
return "", err
diff --git a/scripts/build/release_publisher/localrelease.go b/scripts/build/release_publisher/localrelease.go
index 4f4575c4ff4..332654ee625 100644
--- a/scripts/build/release_publisher/localrelease.go
+++ b/scripts/build/release_publisher/localrelease.go
@@ -2,7 +2,6 @@ package main
import (
"fmt"
- "github.com/pkg/errors"
"io/ioutil"
"log"
"os"
@@ -10,6 +9,8 @@ import (
"regexp"
"strings"
"time"
+
+ "github.com/pkg/errors"
)
type releaseLocalSources struct {
@@ -17,11 +18,11 @@ type releaseLocalSources struct {
artifactConfigurations []buildArtifact
}
-func (r releaseLocalSources) prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error) {
+func (r releaseLocalSources) prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error) {
if !nightly {
- return nil, errors.New("Local releases only supported for nightly builds.")
+ return nil, errors.New("Local releases only supported for nightly builds")
}
- buildData := r.findBuilds(baseArchiveUrl)
+ buildData := r.findBuilds(baseArchiveURL)
rel := release{
Version: buildData.version,
@@ -29,8 +30,8 @@ func (r releaseLocalSources) prepareRelease(baseArchiveUrl, whatsNewUrl string,
Stable: false,
Beta: false,
Nightly: nightly,
- WhatsNewUrl: whatsNewUrl,
- ReleaseNotesUrl: releaseNotesUrl,
+ WhatsNewURL: whatsNewURL,
+ ReleaseNotesURL: releaseNotesURL,
Builds: buildData.builds,
}
@@ -42,13 +43,13 @@ type buildData struct {
builds []build
}
-func (r releaseLocalSources) findBuilds(baseArchiveUrl string) buildData {
+func (r releaseLocalSources) findBuilds(baseArchiveURL string) buildData {
data := buildData{}
- filepath.Walk(r.path, createBuildWalker(r.path, &data, r.artifactConfigurations, baseArchiveUrl))
+ filepath.Walk(r.path, createBuildWalker(r.path, &data, r.artifactConfigurations, baseArchiveURL))
return data
}
-func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifact, baseArchiveUrl string) func(path string, f os.FileInfo, err error) error {
+func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifact, baseArchiveURL string) func(path string, f os.FileInfo, err error) error {
return func(path string, f os.FileInfo, err error) error {
if err != nil {
log.Printf("error: %v", err)
@@ -73,7 +74,7 @@ func createBuildWalker(path string, data *buildData, archiveTypes []buildArtifac
data.version = version
data.builds = append(data.builds, build{
Os: archive.os,
- Url: archive.getUrl(baseArchiveUrl, version, NIGHTLY),
+ URL: archive.getURL(baseArchiveURL, version, NIGHTLY),
Sha256: string(shaBytes),
Arch: archive.arch,
})
@@ -90,5 +91,5 @@ func grabVersion(name string, suffix string) (string, error) {
return string(match[2]), nil
}
- return "", errors.New("No version found.")
+ return "", errors.New("No version found")
}
diff --git a/scripts/build/release_publisher/main.go b/scripts/build/release_publisher/main.go
index 90acb2d3e62..6e1c8f782f0 100644
--- a/scripts/build/release_publisher/main.go
+++ b/scripts/build/release_publisher/main.go
@@ -9,8 +9,8 @@ import (
func main() {
var version string
- var whatsNewUrl string
- var releaseNotesUrl string
+ var whatsNewURL string
+ var releaseNotesURL string
var dryRun bool
var enterprise bool
var fromLocal bool
@@ -18,8 +18,8 @@ func main() {
var apiKey string
flag.StringVar(&version, "version", "", "Grafana version (ex: --version v5.2.0-beta1)")
- flag.StringVar(&whatsNewUrl, "wn", "", "What's new url (ex: --wn http://docs.grafana.org/guides/whats-new-in-v5-2/)")
- flag.StringVar(&releaseNotesUrl, "rn", "", "Grafana version (ex: --rn https://community.grafana.com/t/release-notes-v5-2-x/7894)")
+ flag.StringVar(&whatsNewURL, "wn", "", "What's new url (ex: --wn http://docs.grafana.org/guides/whats-new-in-v5-2/)")
+ flag.StringVar(&releaseNotesURL, "rn", "", "Grafana version (ex: --rn https://community.grafana.com/t/release-notes-v5-2-x/7894)")
flag.StringVar(&apiKey, "apikey", "", "Grafana.com API key (ex: --apikey ABCDEF)")
flag.BoolVar(&dryRun, "dry-run", false, "--dry-run")
flag.BoolVar(&enterprise, "enterprise", false, "--enterprise")
@@ -37,7 +37,7 @@ func main() {
if dryRun {
log.Println("Dry-run has been enabled.")
}
- var baseUrl string
+ var baseURL string
var builder releaseBuilder
var product string
@@ -46,7 +46,7 @@ func main() {
if enterprise {
product = "grafana-enterprise"
- baseUrl = createBaseUrl(archiveProviderRoot, "enterprise", product, nightly)
+ baseURL = createBaseURL(archiveProviderRoot, "enterprise", product, nightly)
var err error
buildArtifacts, err = filterBuildArtifacts([]artifactFilter{
{os: "deb", arch: "amd64"},
@@ -61,7 +61,7 @@ func main() {
} else {
product = "grafana"
- baseUrl = createBaseUrl(archiveProviderRoot, "oss", product, nightly)
+ baseURL = createBaseURL(archiveProviderRoot, "oss", product, nightly)
}
if fromLocal {
@@ -72,7 +72,7 @@ func main() {
}
} else {
builder = releaseFromExternalContent{
- getter: getHttpContents{},
+ getter: getHTTPContents{},
rawVersion: version,
artifactConfigurations: buildArtifacts,
}
@@ -80,18 +80,18 @@ func main() {
p := publisher{
apiKey: apiKey,
- apiUri: "https://grafana.com/api",
+ apiURI: "https://grafana.com/api",
product: product,
dryRun: dryRun,
enterprise: enterprise,
- baseArchiveUrl: baseUrl,
+ baseArchiveURL: baseURL,
builder: builder,
}
- if err := p.doRelease(whatsNewUrl, releaseNotesUrl, nightly); err != nil {
+ if err := p.doRelease(whatsNewURL, releaseNotesURL, nightly); err != nil {
log.Fatalf("error: %v", err)
}
}
-func createBaseUrl(root string, bucketName string, product string, nightly bool) string {
+func createBaseURL(root string, bucketName string, product string, nightly bool) string {
var subPath string
if nightly {
subPath = "master"
diff --git a/scripts/build/release_publisher/publisher.go b/scripts/build/release_publisher/publisher.go
index 1d93c1e306e..8fd139c2638 100644
--- a/scripts/build/release_publisher/publisher.go
+++ b/scripts/build/release_publisher/publisher.go
@@ -4,7 +4,6 @@ import (
"bytes"
"encoding/json"
"fmt"
- "github.com/pkg/errors"
"io/ioutil"
"log"
"net/http"
@@ -14,20 +13,20 @@ import (
type publisher struct {
apiKey string
- apiUri string
+ apiURI string
product string
dryRun bool
enterprise bool
- baseArchiveUrl string
+ baseArchiveURL string
builder releaseBuilder
}
type releaseBuilder interface {
- prepareRelease(baseArchiveUrl, whatsNewUrl string, releaseNotesUrl string, nightly bool) (*release, error)
+ prepareRelease(baseArchiveURL, whatsNewURL string, releaseNotesURL string, nightly bool) (*release, error)
}
-func (p *publisher) doRelease(whatsNewUrl string, releaseNotesUrl string, nightly bool) error {
- currentRelease, err := p.builder.prepareRelease(p.baseArchiveUrl, whatsNewUrl, releaseNotesUrl, nightly)
+func (p *publisher) doRelease(whatsNewURL string, releaseNotesURL string, nightly bool) error {
+ currentRelease, err := p.builder.prepareRelease(p.baseArchiveURL, whatsNewURL, releaseNotesURL, nightly)
if err != nil {
return err
}
@@ -62,23 +61,26 @@ func (p *publisher) postRelease(r *release) error {
return nil
}
-type ReleaseType int
+type releaseType int
const (
- STABLE ReleaseType = iota + 1
+ // STABLE is a release type constant
+ STABLE releaseType = iota + 1
+ // BETA is a release type constant
BETA
+ // NIGHTLY is a release type constant
NIGHTLY
)
-func (rt ReleaseType) beta() bool {
+func (rt releaseType) beta() bool {
return rt == BETA
}
-func (rt ReleaseType) stable() bool {
+func (rt releaseType) stable() bool {
return rt == STABLE
}
-func (rt ReleaseType) nightly() bool {
+func (rt releaseType) nightly() bool {
return rt == NIGHTLY
}
@@ -88,7 +90,7 @@ type buildArtifact struct {
urlPostfix string
}
-func (t buildArtifact) getUrl(baseArchiveUrl, version string, releaseType ReleaseType) string {
+func (t buildArtifact) getURL(baseArchiveURL, version string, releaseType releaseType) string {
prefix := "-"
rhelReleaseExtra := ""
@@ -100,7 +102,7 @@ func (t buildArtifact) getUrl(baseArchiveUrl, version string, releaseType Releas
rhelReleaseExtra = "-1"
}
- url := strings.Join([]string{baseArchiveUrl, prefix, version, rhelReleaseExtra, t.urlPostfix}, "")
+ url := strings.Join([]string{baseArchiveURL, prefix, version, rhelReleaseExtra, t.urlPostfix}, "")
return url
}
@@ -125,11 +127,21 @@ var completeBuildArtifactConfigurations = []buildArtifact{
arch: "armv7",
urlPostfix: "_armhf.deb",
},
+ {
+ os: "deb",
+ arch: "armv6",
+ urlPostfix: "_armel.deb",
+ },
{
os: "rhel",
arch: "armv7",
urlPostfix: ".armhfp.rpm",
},
+ {
+ os: "linux",
+ arch: "armv6",
+ urlPostfix: ".linux-armv6.tar.gz",
+ },
{
os: "linux",
arch: "armv7",
@@ -181,23 +193,23 @@ func filterBuildArtifacts(filters []artifactFilter) ([]buildArtifact, error) {
}
if !matched {
- return nil, errors.New(fmt.Sprintf("No buildArtifact for os=%v, arch=%v", f.os, f.arch))
+ return nil, fmt.Errorf("No buildArtifact for os=%v, arch=%v", f.os, f.arch)
}
}
return artifacts, nil
}
-func newBuild(baseArchiveUrl string, ba buildArtifact, version string, rt ReleaseType, sha256 string) build {
+func newBuild(baseArchiveURL string, ba buildArtifact, version string, rt releaseType, sha256 string) build {
return build{
Os: ba.os,
- Url: ba.getUrl(baseArchiveUrl, version, rt),
+ URL: ba.getURL(baseArchiveURL, version, rt),
Sha256: sha256,
Arch: ba.arch,
}
}
-func (p *publisher) apiUrl(url string) string {
- return fmt.Sprintf("%s/%s%s", p.apiUri, p.product, url)
+func (p *publisher) apiURL(url string) string {
+ return fmt.Sprintf("%s/%s%s", p.apiURI, p.product, url)
}
func (p *publisher) postRequest(url string, obj interface{}, desc string) error {
@@ -207,12 +219,12 @@ func (p *publisher) postRequest(url string, obj interface{}, desc string) error
}
if p.dryRun {
- log.Println(fmt.Sprintf("POST to %s:", p.apiUrl(url)))
+ log.Println(fmt.Sprintf("POST to %s:", p.apiURL(url)))
log.Println(string(jsonBytes))
return nil
}
- req, err := http.NewRequest(http.MethodPost, p.apiUrl(url), bytes.NewReader(jsonBytes))
+ req, err := http.NewRequest(http.MethodPost, p.apiURL(url), bytes.NewReader(jsonBytes))
if err != nil {
return err
}
@@ -254,14 +266,14 @@ type release struct {
Stable bool `json:"stable"`
Beta bool `json:"beta"`
Nightly bool `json:"nightly"`
- WhatsNewUrl string `json:"whatsNewUrl"`
- ReleaseNotesUrl string `json:"releaseNotesUrl"`
+ WhatsNewURL string `json:"whatsNewUrl"`
+ ReleaseNotesURL string `json:"releaseNotesUrl"`
Builds []build `json:"-"`
}
type build struct {
Os string `json:"os"`
- Url string `json:"url"`
+ URL string `json:"url"`
Sha256 string `json:"sha256"`
Arch string `json:"arch"`
}
diff --git a/scripts/build/release_publisher/publisher_test.go b/scripts/build/release_publisher/publisher_test.go
index 2aea55d5ee1..bd2bbdce60e 100644
--- a/scripts/build/release_publisher/publisher_test.go
+++ b/scripts/build/release_publisher/publisher_test.go
@@ -7,69 +7,69 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
cases := []struct {
version string
expectedVersion string
- whatsNewUrl string
- relNotesUrl string
+ whatsNewURL string
+ relNotesURL string
nightly bool
expectedBeta bool
expectedStable bool
expectedArch string
expectedOs string
- expectedUrl string
- baseArchiveUrl string
+ expectedURL string
+ baseArchiveURL string
buildArtifacts []buildArtifact
}{
{
version: "v5.2.0-beta1",
expectedVersion: "5.2.0-beta1",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: false,
expectedBeta: true,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "linux",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.0-beta1.linux-amd64.tar.gz",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.0-beta1.linux-amd64.tar.gz",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"linux", "amd64", ".linux-amd64.tar.gz"}},
},
{
version: "v5.2.3",
expectedVersion: "5.2.3",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: false,
expectedBeta: false,
expectedStable: true,
expectedArch: "amd64",
expectedOs: "rhel",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.3-1.x86_64.rpm",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.3-1.x86_64.rpm",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"rhel", "amd64", ".x86_64.rpm"}},
},
{
version: "v5.4.0-pre1asdf",
expectedVersion: "5.4.0-pre1asdf",
- whatsNewUrl: "https://whatsnews.foo/",
- relNotesUrl: "https://relnotes.foo/",
+ whatsNewURL: "https://whatsnews.foo/",
+ relNotesURL: "https://relnotes.foo/",
nightly: true,
expectedBeta: false,
expectedStable: false,
expectedArch: "amd64",
expectedOs: "rhel",
- expectedUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.x86_64.rpm",
- baseArchiveUrl: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
+ expectedURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.4.0-pre1asdf.x86_64.rpm",
+ baseArchiveURL: "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana",
buildArtifacts: []buildArtifact{{"rhel", "amd64", ".x86_64.rpm"}},
},
}
for _, test := range cases {
builder := releaseFromExternalContent{
- getter: mockHttpGetter{},
+ getter: mockHTTPGetter{},
rawVersion: test.version,
artifactConfigurations: test.buildArtifacts,
}
- rel, _ := builder.prepareRelease(test.baseArchiveUrl, test.whatsNewUrl, test.relNotesUrl, test.nightly)
+ rel, _ := builder.prepareRelease(test.baseArchiveURL, test.whatsNewURL, test.relNotesURL, test.nightly)
if rel.Beta != test.expectedBeta || rel.Stable != test.expectedStable {
t.Errorf("%s should have been tagged as beta=%v, stable=%v.", test.version, test.expectedBeta, test.expectedStable)
@@ -93,21 +93,21 @@ func TestPreparingReleaseFromRemote(t *testing.T) {
t.Errorf("Expected os to be %v, but it was %v", test.expectedOs, build.Os)
}
- if build.Url != test.expectedUrl {
- t.Errorf("Expected url to be %v, but it was %v", test.expectedUrl, build.Url)
+ if build.URL != test.expectedURL {
+ t.Errorf("Expected url to be %v, but it was %v", test.expectedURL, build.URL)
}
}
}
-type mockHttpGetter struct{}
+type mockHTTPGetter struct{}
-func (mockHttpGetter) getContents(url string) (string, error) {
+func (mockHTTPGetter) getContents(url string) (string, error) {
return url, nil
}
func TestPreparingReleaseFromLocal(t *testing.T) {
- whatsNewUrl := "https://whatsnews.foo/"
- relNotesUrl := "https://relnotes.foo/"
+ whatsNewURL := "https://whatsnews.foo/"
+ relNotesURL := "https://relnotes.foo/"
expectedVersion := "5.4.0-123pre1"
expectedBuilds := 4
@@ -118,17 +118,17 @@ func TestPreparingReleaseFromLocal(t *testing.T) {
artifactConfigurations: completeBuildArtifactConfigurations,
}
- relAll, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewUrl, relNotesUrl, true)
+ relAll, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewURL, relNotesURL, true)
if relAll.Stable || !relAll.Nightly {
t.Error("Expected a nightly release but wasn't.")
}
- if relAll.ReleaseNotesUrl != relNotesUrl {
- t.Errorf("expected releaseNotesUrl to be %s, but it was %s", relNotesUrl, relAll.ReleaseNotesUrl)
+ if relAll.ReleaseNotesURL != relNotesURL {
+ t.Errorf("expected releaseNotesURL to be %s, but it was %s", relNotesURL, relAll.ReleaseNotesURL)
}
- if relAll.WhatsNewUrl != whatsNewUrl {
- t.Errorf("expected whatsNewUrl to be %s, but it was %s", whatsNewUrl, relAll.WhatsNewUrl)
+ if relAll.WhatsNewURL != whatsNewURL {
+ t.Errorf("expected whatsNewURL to be %s, but it was %s", whatsNewURL, relAll.WhatsNewURL)
}
if relAll.Beta {
@@ -155,7 +155,7 @@ func TestPreparingReleaseFromLocal(t *testing.T) {
}},
}
- relOne, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewUrl, relNotesUrl, true)
+ relOne, _ := builder.prepareRelease("https://s3-us-west-2.amazonaws.com/grafana-enterprise-releases/master/grafana-enterprise", whatsNewURL, relNotesURL, true)
if len(relOne.Builds) != 1 {
t.Errorf("Expected 1 artifact, but was %v", len(relOne.Builds))
diff --git a/scripts/build/update_repo/README.md b/scripts/build/update_repo/README.md
new file mode 100644
index 00000000000..22f2ea1241d
--- /dev/null
+++ b/scripts/build/update_repo/README.md
@@ -0,0 +1,28 @@
+# Repository updates deb/rpm
+
+
+
+## Testing
+
+It's possible to test the repo updates for rpm and deb by running the test scripts within a docker container like this. Tests are being executed by using two buckets on gcp setup for testing.
+
+```bash
+docker run -ti --rm -u 0:0 grafana/grafana-ci-deploy:1.2.0 bash # 1.2.0 is the newest image at the time of writing
+# in the container:
+mkdir -p /go/src/github.com/grafana/dist
+cd /go/src/github.com/grafana
+
+#outside of container:
+cd /..
+docker cp grafana :/go/src/github.com/grafana/.
+docker cp :/private.key
+
+#in container:
+gpg --batch --allow-secret-key-import --import /private.key
+cd dist && wget https://dl.grafana.com/oss/release/grafana_5.4.3_amd64.deb && wget https://dl.grafana.com/oss/release/grafana-5.4.3-1.x86_64.rpm && cd ..
+
+#run these scripts:
+./script/build/update_repo/test-update-deb-repo.sh
+./script/build/update_repo/test-update-rpm-repo.sh
+
+```
diff --git a/scripts/build/update_repo/init-deb-repo.sh b/scripts/build/update_repo/init-deb-repo.sh
new file mode 100755
index 00000000000..2b245dc2d42
--- /dev/null
+++ b/scripts/build/update_repo/init-deb-repo.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+# Run this if you need to recreate the debian repository for some reason
+
+# Setup environment
+cp scripts/build/update_repo/aptly.conf /etc/aptly.conf
+mkdir -p /deb-repo/db \
+ /deb-repo/repo \
+ /deb-repo/tmp
+
+aptly repo create -distribution=stable -component=main grafana
+aptly repo create -distribution=beta -component=main beta
diff --git a/scripts/build/update_repo/test-update-deb-repo.sh b/scripts/build/update_repo/test-update-deb-repo.sh
new file mode 100755
index 00000000000..f27e9bec265
--- /dev/null
+++ b/scripts/build/update_repo/test-update-deb-repo.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+GPG_PASS=${1:-}
+
+./scripts/build/update_repo/update-deb.sh "oss" "$GPG_PASS" "v5.4.3" "dist" "grafana-testing-aptly-db" "grafana-testing-repo"
diff --git a/scripts/build/update_repo/test-update-rpm-repo.sh b/scripts/build/update_repo/test-update-rpm-repo.sh
new file mode 100755
index 00000000000..de85f000de8
--- /dev/null
+++ b/scripts/build/update_repo/test-update-rpm-repo.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+GPG_PASS=${1:-}
+
+./scripts/build/update_repo/update-rpm.sh "oss" "$GPG_PASS" "v5.4.3" "dist" "grafana-testing-repo"
diff --git a/scripts/build/update_repo/update-deb.sh b/scripts/build/update_repo/update-deb.sh
index 89c5937b064..a70af5b8b5c 100755
--- a/scripts/build/update_repo/update-deb.sh
+++ b/scripts/build/update_repo/update-deb.sh
@@ -3,10 +3,14 @@
RELEASE_TYPE="${1:-}"
GPG_PASS="${2:-}"
RELEASE_TAG="${3:-}"
+DIST_PATH="${4:-}"
+GCP_DB_BUCKET="${5:-grafana-aptly-db}"
+GCP_REPO_BUCKET="${6:-grafana-repo}"
+
REPO="grafana"
-if [ -z "$RELEASE_TYPE" -o -z "$GPG_PASS" ]; then
- echo "Both RELEASE_TYPE (arg 1) and GPG_PASS (arg 2) has to be set"
+if [ -z "$RELEASE_TYPE" -o -z "$GPG_PASS" -o -z "$DIST_PATH" ]; then
+ echo "Both RELEASE_TYPE (arg 1), GPG_PASS (arg 2) and DIST_PATH (arg 4) has to be set"
exit 1
fi
@@ -22,36 +26,42 @@ fi
set -e
# Setup environment
-cp scripts/build/update_repo/aptly.conf /etc/aptly.conf
+cp scripts/build/update_repo/aptly.conf ~/.aptly.conf
+
mkdir -p /deb-repo/db \
/deb-repo/repo \
/deb-repo/tmp
# Download the database
-gsutil -m rsync -r "gs://grafana-aptly-db/$RELEASE_TYPE" /deb-repo/db
+gsutil -m rsync -r -d "gs://$GCP_DB_BUCKET/$RELEASE_TYPE" /deb-repo/db
# Add the new release to the repo
-aptly publish drop grafana filesystem:repo:grafana || true
-aptly publish drop beta filesystem:repo:grafana || true
-cp ./dist/*.deb /deb-repo/tmp
+cp $DIST_PATH/*.deb /deb-repo/tmp
rm /deb-repo/tmp/grafana_latest*.deb || true
-aptly repo add "$REPO" ./dist
+aptly repo add "$REPO" /deb-repo/tmp #adds too many packages in enterprise
# Setup signing and sign the repo
echo "allow-loopback-pinentry" > ~/.gnupg/gpg-agent.conf
echo "pinentry-mode loopback" > ~/.gnupg/gpg.conf
+pkill gpg-agent || true
touch /tmp/sign-this
+rm /tmp/sign-this.asc || true
./scripts/build/update_repo/unlock-gpg-key.sh "$GPG_PASS"
rm /tmp/sign-this /tmp/sign-this.asc
-aptly publish repo grafana filesystem:repo:grafana
-aptly publish repo beta filesystem:repo:grafana
+aptly publish update stable filesystem:repo:grafana
+aptly publish update beta filesystem:repo:grafana
# Update the repo and db on gcp
-gsutil -m rsync -r -d /deb-repo/db "gs://grafana-aptly-db/$RELEASE_TYPE"
-gsutil -m rsync -r -d /deb-repo/repo/grafana "gs://grafana-repo/$RELEASE_TYPE/deb"
+
+gsutil -m rsync -r -d /deb-repo/db "gs://$GCP_DB_BUCKET/$RELEASE_TYPE"
+
+# Uploads the binaries before the metadata (to prevent 404's for debs)
+gsutil -m rsync -r /deb-repo/repo/grafana/pool "gs://$GCP_REPO_BUCKET/$RELEASE_TYPE/deb/pool"
+
+gsutil -m rsync -r -d /deb-repo/repo/grafana "gs://$GCP_REPO_BUCKET/$RELEASE_TYPE/deb"
# usage:
#
diff --git a/scripts/build/update_repo/update-rpm.sh b/scripts/build/update_repo/update-rpm.sh
index caed3918216..f02647f55a0 100755
--- a/scripts/build/update_repo/update-rpm.sh
+++ b/scripts/build/update_repo/update-rpm.sh
@@ -2,12 +2,14 @@
RELEASE_TYPE="${1:-}"
GPG_PASS="${2:-}"
-
RELEASE_TAG="${3:-}"
+DIST_PATH="${4:-}"
+GCP_REPO_BUCKET="${5:-grafana-repo}"
+
REPO="rpm"
-if [ -z "$RELEASE_TYPE" -o -z "$GPG_PASS" ]; then
- echo "Both RELEASE_TYPE (arg 1) and GPG_PASS (arg 2) has to be set"
+if [ -z "$RELEASE_TYPE" -o -z "$GPG_PASS" -o -z "$DIST_PATH" ]; then
+ echo "Both RELEASE_TYPE (arg 1), GPG_PASS (arg 2) and DIST_PATH (arg 4) has to be set"
exit 1
fi
@@ -23,17 +25,17 @@ fi
set -e
# Setup environment
-BUCKET="gs://grafana-repo/$RELEASE_TYPE/$REPO"
+BUCKET="gs://$GCP_REPO_BUCKET/$RELEASE_TYPE/$REPO"
+
mkdir -p /rpm-repo
# Download the database
gsutil -m rsync -r "$BUCKET" /rpm-repo
# Add the new release to the repo
-cp ./dist/*.rpm /rpm-repo
+cp $DIST_PATH/*.rpm /rpm-repo # adds to many files for enterprise
rm /rpm-repo/grafana-latest-1*.rpm || true
-cd /rpm-repo
-createrepo .
+createrepo /rpm-repo
# Setup signing and sign the repo
@@ -45,6 +47,7 @@ pkill gpg-agent || true
./scripts/build/update_repo/sign-rpm-repo.sh "$GPG_PASS"
# Update the repo and db on gcp
+gsutil -m cp /rpm-repo/*.rpm "$BUCKET" # sync binaries first to avoid cache misses
gsutil -m rsync -r -d /rpm-repo "$BUCKET"
# usage:
@@ -56,4 +59,4 @@ gsutil -m rsync -r -d /rpm-repo "$BUCKET"
# gpgcheck=1
# gpgkey=https://packages.grafana.com/gpg.key
# sslverify=1
-# sslcacert=/etc/pki/tls/certs/ca-bundle.crt
\ No newline at end of file
+# sslcacert=/etc/pki/tls/certs/ca-bundle.crt
diff --git a/scripts/gometalinter.sh b/scripts/gometalinter.sh
new file mode 100755
index 00000000000..b360b7f1222
--- /dev/null
+++ b/scripts/gometalinter.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+function exit_if_fail {
+ command=$@
+ echo "Executing '$command'"
+ eval $command
+ rc=$?
+ if [ $rc -ne 0 ]; then
+ echo "'$command' returned $rc."
+ exit $rc
+ fi
+}
+
+go get -u github.com/alecthomas/gometalinter
+go get -u github.com/tsenart/deadcode
+go get -u github.com/jgautheron/goconst/cmd/goconst
+go get -u github.com/gordonklaus/ineffassign
+go get -u github.com/opennota/check/cmd/structcheck
+go get -u github.com/mdempsky/unconvert
+go get -u github.com/opennota/check/cmd/varcheck
+go get -u honnef.co/go/tools/cmd/staticcheck
+
+exit_if_fail gometalinter --enable-gc --vendor --deadline 10m --disable-all \
+ --enable=deadcode \
+ --enable=goconst \
+ --enable=gofmt \
+ --enable=ineffassign \
+ --enable=structcheck \
+ --enable=unconvert \
+ --enable=varcheck \
+ --enable=staticcheck
+
+exit_if_fail go vet ./pkg/...
diff --git a/style_guides/frontend.md b/style_guides/frontend.md
new file mode 100644
index 00000000000..8d0849506a3
--- /dev/null
+++ b/style_guides/frontend.md
@@ -0,0 +1,62 @@
+# Frontend Style Guide
+
+Generally we follow the Airbnb [React Style Guide](https://github.com/airbnb/javascript/tree/master/react).
+
+## Table of Contents
+
+ 1. [Basic Rules](#basic-rules)
+ 1. [File & Component Organization](#Organization)
+ 1. [Naming](#naming)
+ 1. [Declaration](#declaration)
+ 1. [Props](#props)
+ 1. [Refs](#refs)
+ 1. [Methods](#methods)
+ 1. [Ordering](#ordering)
+
+## Basic rules
+
+* Try to keep files small and focused and break large components up into sub components.
+
+## Organization
+
+* Components and types that needs to be used by external plugins needs to go into @grafana/ui
+* Components should get their own folder under features/xxx/components
+ * Sub components can live in that component folders, so not small component needs their own folder
+ * Place test next to their component file (same dir)
+ * Mocks in __mocks__ dir
+ * Test utils in __tests__ dir
+ * Component sass should live in the same folder as component code
+* State logic & domain models should live in features/xxx/state
+* Containers (pages) can live in feature root features/xxx
+ * up for debate?
+
+## Props
+
+* Name callback props & handlers with a "on" prefix.
+
+```tsx
+// good
+onChange = () => {
+
+};
+
+render() {
+ return (
+
+ );
+}
+
+// bad
+handleChange = () => {
+
+};
+
+render() {
+ return (
+
+ );
+}
+```
+
+
+
diff --git a/yarn.lock b/yarn.lock
index f291a832593..aa71fadc171 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3578,6 +3578,11 @@ cssesc@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+cssfilter@0.0.10:
+ version "0.0.10"
+ resolved "https://registry.yarnpkg.com/cssfilter/-/cssfilter-0.0.10.tgz#c6d2672632a2e5c83e013e6864a42ce8defd20ae"
+ integrity sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=
+
cssnano@^3.10.0:
version "3.10.0"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
@@ -13379,6 +13384,14 @@ xregexp@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+xss@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.3.tgz#d04bd2558fd6c29c46113824d5e8b2a910054e23"
+ integrity sha512-LTpz3jXPLUphMMmyufoZRSKnqMj41OVypZ8uYGzvjkMV9C1EdACrhQl/EM8Qfh5htSAuMIQFOejmKAZGkJfaCg==
+ dependencies:
+ commander "^2.9.0"
+ cssfilter "0.0.10"
+
xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"