- {thresholds.map((threshold, index) => {
- return (
-
-
this.onAddThreshold(threshold.index + 1)}
- >
-
+ {thresholds
+ .slice(0)
+ .reverse()
+ .map((threshold, index) => {
+ return (
+
+
this.onAddThreshold(threshold.index + 1)}
+ >
+
+
+
+
{this.renderInput(threshold)}
-
-
{this.renderInput(threshold)}
-
- );
- })}
+ );
+ })}
);
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss b/packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss
index 8ef59bf08af..af70fd86f7a 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/_ThresholdsEditor.scss
@@ -43,7 +43,7 @@
}
.thresholds-row-input {
- margin-top: 49px;
+ margin-top: 44px;
margin-left: 2px;
}
diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap b/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
new file mode 100644
index 00000000000..b0dc025090b
--- /dev/null
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Render should render with base threshold 1`] = `
+
+
+
+`;
diff --git a/packages/grafana-ui/src/utils/valueFormats/categories.ts b/packages/grafana-ui/src/utils/valueFormats/categories.ts
index efba2cc5b79..e127285b473 100644
--- a/packages/grafana-ui/src/utils/valueFormats/categories.ts
+++ b/packages/grafana-ui/src/utils/valueFormats/categories.ts
@@ -191,6 +191,7 @@ export const getCategories = (): ValueFormatCategory[] => [
{ name: 'Litre/hour', id: 'litreh', fn: toFixedUnit('l/h') },
{ name: 'Litre/min (l/min)', id: 'flowlpm', fn: toFixedUnit('l/min') },
{ name: 'milliLitre/min (mL/min)', id: 'flowmlpm', fn: toFixedUnit('mL/min') },
+ { name: 'Lux (lx)', id: 'lux', fn: toFixedUnit('lux') },
],
},
{
diff --git a/pkg/api/index.go b/pkg/api/index.go
index e90db84016d..248ebf63f0f 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -145,7 +145,7 @@ func (hs *HTTPServer) setIndexViewData(c *m.ReqContext) (*dtos.IndexViewData, er
Text: "Explore",
Id: "explore",
SubTitle: "Explore your data",
- Icon: "fa fa-rocket",
+ Icon: "gicon gicon-explore",
Url: setting.AppSubUrl + "/explore",
})
}
diff --git a/pkg/cmd/grafana-cli/commands/install_command.go b/pkg/cmd/grafana-cli/commands/install_command.go
index f88bb9bbfff..d758633fea5 100644
--- a/pkg/cmd/grafana-cli/commands/install_command.go
+++ b/pkg/cmd/grafana-cli/commands/install_command.go
@@ -57,6 +57,8 @@ func installCommand(c CommandLine) error {
return InstallPlugin(pluginToInstall, version, c)
}
+// InstallPlugin downloads the plugin code as a zip file from the Grafana.com API
+// and then extracts the zip into the plugins directory.
func InstallPlugin(pluginName, version string, c CommandLine) error {
pluginFolder := c.PluginDirectory()
downloadURL := c.PluginURL()
@@ -152,6 +154,10 @@ func downloadFile(pluginName, filePath, url string) (err error) {
return err
}
+ return extractFiles(body, pluginName, filePath)
+}
+
+func extractFiles(body []byte, pluginName string, filePath string) error {
r, err := zip.NewReader(bytes.NewReader(body), int64(len(body)))
if err != nil {
return err
@@ -161,12 +167,18 @@ func downloadFile(pluginName, filePath, url string) (err error) {
if zf.FileInfo().IsDir() {
err := os.Mkdir(newFile, 0777)
- if PermissionsError(err) {
+ if permissionsError(err) {
return fmt.Errorf(permissionsDeniedMessage, newFile)
}
} else {
- dst, err := os.Create(newFile)
- if PermissionsError(err) {
+ fileMode := zf.Mode()
+
+ if strings.HasSuffix(newFile, "_linux_amd64") || strings.HasSuffix(newFile, "_darwin_amd64") {
+ fileMode = os.FileMode(0755)
+ }
+
+ dst, err := os.OpenFile(newFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, fileMode)
+ if permissionsError(err) {
return fmt.Errorf(permissionsDeniedMessage, newFile)
}
@@ -184,6 +196,6 @@ func downloadFile(pluginName, filePath, url string) (err error) {
return nil
}
-func PermissionsError(err error) bool {
+func permissionsError(err error) bool {
return err != nil && strings.Contains(err.Error(), "permission denied")
}
diff --git a/pkg/cmd/grafana-cli/commands/install_command_test.go b/pkg/cmd/grafana-cli/commands/install_command_test.go
index 52b329adf7f..3554dda82a9 100644
--- a/pkg/cmd/grafana-cli/commands/install_command_test.go
+++ b/pkg/cmd/grafana-cli/commands/install_command_test.go
@@ -1,6 +1,8 @@
package commands
import (
+ "io/ioutil"
+ "os"
"testing"
. "github.com/smartystreets/goconvey/convey"
@@ -37,3 +39,42 @@ func TestFoldernameReplacement(t *testing.T) {
})
})
}
+
+func TestExtractFiles(t *testing.T) {
+ Convey("Should preserve file permissions for plugin backend binaries for linux and darwin", t, func() {
+ err := os.RemoveAll("testdata/fake-plugins-dir")
+ So(err, ShouldBeNil)
+
+ err = os.MkdirAll("testdata/fake-plugins-dir", 0774)
+ So(err, ShouldBeNil)
+
+ body, err := ioutil.ReadFile("testdata/grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip")
+ So(err, ShouldBeNil)
+
+ err = extractFiles(body, "grafana-simple-json-datasource", "testdata/fake-plugins-dir")
+ So(err, ShouldBeNil)
+
+ //File in zip has permissions 777
+ fileInfo, err := os.Stat("testdata/fake-plugins-dir/grafana-simple-json-datasource/simple-plugin_darwin_amd64")
+ So(err, ShouldBeNil)
+ So(fileInfo.Mode().String(), ShouldEqual, "-rwxr-xr-x")
+
+ //File in zip has permission 664
+ fileInfo, err = os.Stat("testdata/fake-plugins-dir/grafana-simple-json-datasource/simple-plugin_linux_amd64")
+ So(err, ShouldBeNil)
+ So(fileInfo.Mode().String(), ShouldEqual, "-rwxr-xr-x")
+
+ //File in zip has permission 644
+ fileInfo, err = os.Stat("testdata/fake-plugins-dir/grafana-simple-json-datasource/simple-plugin_windows_amd64.exe")
+ So(err, ShouldBeNil)
+ So(fileInfo.Mode().String(), ShouldEqual, "-rw-r--r--")
+
+ //File in zip has permission 755
+ fileInfo, err = os.Stat("testdata/fake-plugins-dir/grafana-simple-json-datasource/non-plugin-binary")
+ So(err, ShouldBeNil)
+ So(fileInfo.Mode().String(), ShouldEqual, "-rwxr-xr-x")
+
+ err = os.RemoveAll("testdata/fake-plugins-dir")
+ So(err, ShouldBeNil)
+ })
+}
diff --git a/pkg/cmd/grafana-cli/commands/testdata/grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip b/pkg/cmd/grafana-cli/commands/testdata/grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip
new file mode 100644
index 00000000000..f9263ab3e78
Binary files /dev/null and b/pkg/cmd/grafana-cli/commands/testdata/grafana-simple-json-datasource-ec18fa4da8096a952608a7e4c7782b4260b41bcf.zip differ
diff --git a/pkg/services/auth/token_cleanup.go b/pkg/services/auth/token_cleanup.go
index aa5bc4856ab..1fe0996aa4c 100644
--- a/pkg/services/auth/token_cleanup.go
+++ b/pkg/services/auth/token_cleanup.go
@@ -52,6 +52,6 @@ func (srv *UserAuthTokenService) deleteExpiredTokens(maxInactiveLifetime, maxLif
return 0, nil
}
- srv.log.Info("cleanup of expired auth tokens done", "count", affected)
+ srv.log.Debug("cleanup of expired auth tokens done", "count", affected)
return affected, err
}
diff --git a/public/app/features/dashboard/components/DashNav/DashNav.tsx b/public/app/features/dashboard/components/DashNav/DashNav.tsx
index 8806e35c6b6..99ce3f904cd 100644
--- a/public/app/features/dashboard/components/DashNav/DashNav.tsx
+++ b/public/app/features/dashboard/components/DashNav/DashNav.tsx
@@ -65,7 +65,7 @@ export class DashNav extends PureComponent
{
});
} else {
this.props.updateLocation({
- query: { panelId: null, edit: null, fullscreen: null },
+ query: { panelId: null, edit: null, fullscreen: null, tab: null },
partial: true,
});
}
diff --git a/public/app/features/dashboard/services/DashboardSrv.ts b/public/app/features/dashboard/services/DashboardSrv.ts
index e20c0ed5a31..c82aed13e44 100644
--- a/public/app/features/dashboard/services/DashboardSrv.ts
+++ b/public/app/features/dashboard/services/DashboardSrv.ts
@@ -43,6 +43,7 @@ export class DashboardSrv {
delete urlParams.fullscreen;
delete urlParams.edit;
delete urlParams.panelId;
+ delete urlParams.tab;
this.$location.search(urlParams);
return;
}
@@ -58,6 +59,7 @@ export class DashboardSrv {
urlParams.edit = true;
} else {
delete urlParams.edit;
+ delete urlParams.tab;
}
if (options.panelId || options.panelId === 0) {
diff --git a/public/app/features/dashboard/state/DashboardMigrator.ts b/public/app/features/dashboard/state/DashboardMigrator.ts
index 1aa310308d5..c43f4c491c0 100644
--- a/public/app/features/dashboard/state/DashboardMigrator.ts
+++ b/public/app/features/dashboard/state/DashboardMigrator.ts
@@ -399,6 +399,12 @@ export class DashboardMigrator {
prefix: panel.options.prefix,
suffix: panel.options.suffix,
};
+
+ // correct order
+ if (panel.options.thresholds) {
+ panel.options.thresholds.reverse();
+ }
+
// this options prop was due to a bug
delete panel.options.options;
delete panel.options.unit;
diff --git a/public/app/features/dashboard/state/PanelModel.test.ts b/public/app/features/dashboard/state/PanelModel.test.ts
index d96838dc640..079946b1521 100644
--- a/public/app/features/dashboard/state/PanelModel.test.ts
+++ b/public/app/features/dashboard/state/PanelModel.test.ts
@@ -10,6 +10,20 @@ describe('PanelModel', () => {
type: 'table',
showColumns: true,
targets: [{ refId: 'A' }, { noRefId: true }],
+ options: {
+ thresholds: [
+ {
+ color: '#F2495C',
+ index: 1,
+ value: 50,
+ },
+ {
+ color: '#73BF69',
+ index: 0,
+ value: null,
+ },
+ ],
+ },
});
});
@@ -35,6 +49,21 @@ describe('PanelModel', () => {
expect(saveModel.events).toBe(undefined);
});
+ it('should restore -Infinity value for base threshold', () => {
+ expect(model.options.thresholds).toEqual([
+ {
+ color: '#F2495C',
+ index: 1,
+ value: 50,
+ },
+ {
+ color: '#73BF69',
+ index: 0,
+ value: -Infinity,
+ },
+ ]);
+ });
+
describe('when changing panel type', () => {
beforeEach(() => {
model.changeType('graph', true);
diff --git a/public/app/features/dashboard/state/PanelModel.ts b/public/app/features/dashboard/state/PanelModel.ts
index fda586d2776..ac3722d61c2 100644
--- a/public/app/features/dashboard/state/PanelModel.ts
+++ b/public/app/features/dashboard/state/PanelModel.ts
@@ -3,7 +3,7 @@ import _ from 'lodash';
// Types
import { Emitter } from 'app/core/utils/emitter';
-import { DataQuery, TimeSeries } from '@grafana/ui';
+import { DataQuery, TimeSeries, Threshold } from '@grafana/ui';
import { TableData } from '@grafana/ui/src';
export interface GridPos {
@@ -46,8 +46,6 @@ const mustKeepProps: { [str: string]: boolean } = {
timeFrom: true,
timeShift: true,
hideTimeOverride: true,
- maxDataPoints: true,
- interval: true,
description: true,
links: true,
fullscreen: true,
@@ -91,7 +89,9 @@ export class PanelModel {
timeFrom?: any;
timeShift?: any;
hideTimeOverride?: any;
- options: object;
+ options: {
+ [key: string]: any;
+ };
maxDataPoints?: number;
interval?: string;
@@ -119,6 +119,8 @@ export class PanelModel {
_.defaultsDeep(this, _.cloneDeep(defaults));
// queries must have refId
this.ensureQueryIds();
+
+ this.restoreInfintyForThresholds();
}
ensureQueryIds() {
@@ -131,6 +133,19 @@ export class PanelModel {
}
}
+ restoreInfintyForThresholds() {
+ if (this.options && this.options.thresholds) {
+ this.options.thresholds = this.options.thresholds.map((threshold: Threshold) => {
+ // JSON serialization of -Infinity is 'null' so lets convert it back to -Infinity
+ if (threshold.index === 0 && threshold.value === null) {
+ return { ...threshold, value: -Infinity };
+ }
+
+ return threshold;
+ });
+ }
+ }
+
getOptions(panelDefaults) {
return _.defaultsDeep(this.options || {}, panelDefaults);
}
diff --git a/public/app/features/explore/ExploreToolbar.tsx b/public/app/features/explore/ExploreToolbar.tsx
index 786998c96c1..adcd0c8afa8 100644
--- a/public/app/features/explore/ExploreToolbar.tsx
+++ b/public/app/features/explore/ExploreToolbar.tsx
@@ -103,18 +103,16 @@ export class UnConnectedExploreToolbar extends PureComponent {
{exploreId === 'left' && (
-
+
Explore
)}
-
- {exploreId === 'right' && (
-
-
-
- )}
-