diff --git a/CHANGELOG.md b/CHANGELOG.md index 989dab3bb99..514a457e5db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [Issue #1241](https://github.com/grafana/grafana/issues/1242). Timepicker: New option in timepicker (under dashboard settings), to change ``now`` to be for example ``now-1m``, usefull when you want to ignore last minute because it contains incomplete data - [Issue #171](https://github.com/grafana/grafana/issues/171). Panel: Different time periods, panels can override dashboard relative time and/or add a time shift - [Issue #1488](https://github.com/grafana/grafana/issues/1488). Dashboard: Clone dashboard / Save as +- [Issue #1458](https://github.com/grafana/grafana/issues/1458). User: persisted user option for dark or light theme (no longer an option on a dashboard) **Enhancements** - [Issue #1366](https://github.com/grafana/grafana/issues/1366). Graph & Singlestat: Support for additional units, Fahrenheit (°F) and Celsius (°C), Humidity (%H), kW, watt-hour (Wh), kilowatt-hour (kWh), velocities (m/s, km/h, mpg, knot) diff --git a/pkg/api/admin_users.go b/pkg/api/admin_users.go index 1b0c11543f5..d3fa111d333 100644 --- a/pkg/api/admin_users.go +++ b/pkg/api/admin_users.go @@ -28,7 +28,7 @@ func AdminGetUser(c *middleware.Context) { return } - result := m.UserDTO{ + result := dtos.AdminUserListItem{ Name: query.Result.Name, Email: query.Result.Email, Login: query.Result.Login, diff --git a/pkg/api/dataproxy_test.go b/pkg/api/dataproxy_test.go index 2ec7b868038..842730891ae 100644 --- a/pkg/api/dataproxy_test.go +++ b/pkg/api/dataproxy_test.go @@ -29,7 +29,7 @@ func TestDataSourceProxy(t *testing.T) { Convey("When getting influxdb datasource proxy", t, func() { ds := m.DataSource{ - Type: m.DS_INFLUXDB, + Type: m.DS_INFLUXDB_08, Url: "http://influxdb:8083", Database: "site", User: "user", diff --git a/pkg/api/dtos/models.go b/pkg/api/dtos/models.go index be985866458..d7c6c955882 100644 --- a/pkg/api/dtos/models.go +++ b/pkg/api/dtos/models.go @@ -19,6 +19,7 @@ type CurrentUser struct { Login string `json:"login"` Email string `json:"email"` Name string `json:"name"` + LightTheme bool `json:"lightTheme"` OrgRole m.RoleType `json:"orgRole"` OrgName string `json:"orgName"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` diff --git a/pkg/api/dtos/user.go b/pkg/api/dtos/user.go index 0047b3c5a98..0224ced599d 100644 --- a/pkg/api/dtos/user.go +++ b/pkg/api/dtos/user.go @@ -20,3 +20,10 @@ type AdminUpdateUserPasswordForm struct { type AdminUpdateUserPermissionsForm struct { IsGrafanaAdmin bool `json:"IsGrafanaAdmin" binding:"Required"` } + +type AdminUserListItem struct { + Email string `json:"email"` + Name string `json:"name"` + Login string `json:"login"` + IsGrafanaAdmin bool `json:"isGrafanaAdmin"` +} diff --git a/pkg/api/index.go b/pkg/api/index.go index 5cd161bb3d2..3006c54e8ab 100644 --- a/pkg/api/index.go +++ b/pkg/api/index.go @@ -17,6 +17,7 @@ func setIndexViewData(c *middleware.Context) error { Login: c.Login, Email: c.Email, Name: c.Name, + LightTheme: c.Theme == "light", OrgName: c.OrgName, OrgRole: c.OrgRole, GravatarUrl: dtos.GetGravatarUrl(c.Email), diff --git a/pkg/api/user.go b/pkg/api/user.go index f6fb0e41034..9d870a10a1b 100644 --- a/pkg/api/user.go +++ b/pkg/api/user.go @@ -8,7 +8,7 @@ import ( ) func GetUser(c *middleware.Context) { - query := m.GetUserInfoQuery{UserId: c.UserId} + query := m.GetUserProfileQuery{UserId: c.UserId} if err := bus.Dispatch(&query); err != nil { c.JsonApiErr(500, "Failed to get user", err) diff --git a/pkg/models/user.go b/pkg/models/user.go index d5a3dbfacb6..cdc688d4c1f 100644 --- a/pkg/models/user.go +++ b/pkg/models/user.go @@ -48,6 +48,7 @@ type UpdateUserCommand struct { Name string `json:"name"` Email string `json:"email"` Login string `json:"login"` + Theme string `json:"theme"` UserId int64 `json:"-"` } @@ -91,9 +92,9 @@ type GetSignedInUserQuery struct { Result *SignedInUser } -type GetUserInfoQuery struct { +type GetUserProfileQuery struct { UserId int64 - Result UserDTO + Result UserProfileDTO } type SearchUsersQuery struct { @@ -120,14 +121,16 @@ type SignedInUser struct { Login string Name string Email string + Theme string ApiKeyId int64 IsGrafanaAdmin bool } -type UserDTO struct { +type UserProfileDTO struct { Email string `json:"email"` Name string `json:"name"` Login string `json:"login"` + Theme string `json:"theme"` IsGrafanaAdmin bool `json:"isGrafanaAdmin"` } diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go index 5d3e10f17b4..d6a138ac76e 100644 --- a/pkg/plugins/plugins_test.go +++ b/pkg/plugins/plugins_test.go @@ -14,6 +14,6 @@ func TestPluginScans(t *testing.T) { err := scan(path) So(err, ShouldBeNil) - So(len(DataSources), ShouldEqual, 1) + So(len(DataSources), ShouldBeGreaterThan, 1) }) } diff --git a/pkg/services/sqlstore/org_test.go b/pkg/services/sqlstore/org_test.go index f839d554c34..293947c2001 100644 --- a/pkg/services/sqlstore/org_test.go +++ b/pkg/services/sqlstore/org_test.go @@ -53,8 +53,8 @@ func TestAccountDataAccess(t *testing.T) { ac2 := ac2cmd.Result Convey("Should be able to read user info projection", func() { - query := m.GetUserInfoQuery{UserId: ac1.Id} - err = GetUserInfo(&query) + query := m.GetUserProfileQuery{UserId: ac1.Id} + err = GetUserProfile(&query) So(err, ShouldBeNil) So(query.Result.Email, ShouldEqual, "ac1@test.com") diff --git a/pkg/services/sqlstore/user.go b/pkg/services/sqlstore/user.go index 5c3b69a2bb0..63977a21540 100644 --- a/pkg/services/sqlstore/user.go +++ b/pkg/services/sqlstore/user.go @@ -21,7 +21,7 @@ func init() { bus.AddHandler("sql", ChangeUserPassword) bus.AddHandler("sql", GetUserByLogin) bus.AddHandler("sql", SetUsingOrg) - bus.AddHandler("sql", GetUserInfo) + bus.AddHandler("sql", GetUserProfile) bus.AddHandler("sql", GetSignedInUser) bus.AddHandler("sql", SearchUsers) bus.AddHandler("sql", GetUserOrgList) @@ -165,6 +165,7 @@ func UpdateUser(cmd *m.UpdateUserCommand) error { Name: cmd.Name, Email: cmd.Email, Login: cmd.Login, + Theme: cmd.Theme, Updated: time.Now(), } @@ -211,7 +212,7 @@ func SetUsingOrg(cmd *m.SetUsingOrgCommand) error { }) } -func GetUserInfo(query *m.GetUserInfoQuery) error { +func GetUserProfile(query *m.GetUserProfileQuery) error { var user m.User has, err := x.Id(query.UserId).Get(&user) @@ -221,10 +222,11 @@ func GetUserInfo(query *m.GetUserInfoQuery) error { return m.ErrUserNotFound } - query.Result = m.UserDTO{ + query.Result = m.UserProfileDTO{ Name: user.Name, Email: user.Email, Login: user.Login, + Theme: user.Theme, } return err @@ -247,6 +249,7 @@ func GetSignedInUser(query *m.GetSignedInUserQuery) error { u.email as email, u.login as login, u.name as name, + u.theme as theme, org.name as org_name, org_user.role as org_role, org.id as org_id diff --git a/src/app/features/dashboard/dashboardCtrl.js b/src/app/features/dashboard/dashboardCtrl.js index 8ec13b24f2d..c9a5f119e09 100644 --- a/src/app/features/dashboard/dashboardCtrl.js +++ b/src/app/features/dashboard/dashboardCtrl.js @@ -65,11 +65,6 @@ function (angular, $, config) { $scope.setWindowTitleAndTheme = function() { window.document.title = config.window_title_prefix + $scope.dashboard.title; - $scope.contextSrv.lightTheme = $scope.dashboard.style === 'light'; - }; - - $scope.styleUpdated = function() { - $scope.contextSrv.lightTheme = $scope.dashboard.style === 'light'; }; $scope.broadcastRefresh = function() { diff --git a/src/app/features/org/partials/datasourceEdit.html b/src/app/features/org/partials/datasourceEdit.html index b0f30c214b3..542f6b742e4 100644 --- a/src/app/features/org/partials/datasourceEdit.html +++ b/src/app/features/org/partials/datasourceEdit.html @@ -9,39 +9,63 @@

Add data source

-

Edit {{current.name}}

+

Edit data source

-
-
- - -
-
- - -
- +
+
    +
  • + Name +
    • +
  • +
  • + +
    • + +
  • + Default  + + +
    • +
+
- -
-
- - -
-
- - -
+
+
    +
  • + Type +
    • +
  • + +
    • +
+
+
+
+
    +
  • + Url +
    • +
  • + +
    • +
  • + Access Direct = url is used directly from browser, Proxy = Grafana backend will proxy the request +
    • +
  • + +
    • +
+
-
- - - - Cancel +
+ + + Cancel +

diff --git a/src/app/features/panel/soloPanelCtrl.js b/src/app/features/panel/soloPanelCtrl.js index d1b7b7e2cd6..1d134a73827 100644 --- a/src/app/features/panel/soloPanelCtrl.js +++ b/src/app/features/panel/soloPanelCtrl.js @@ -24,7 +24,6 @@ function (angular, $) { $scope.initPanelScope = function(dashboard) { $scope.dashboard = dashboardSrv.create(dashboard.model); - $scope.contextSrv.lightTheme = $scope.dashboard.style === 'light'; $scope.row = { height: $(window).height() + 'px', diff --git a/src/app/features/profile/partials/profile.html b/src/app/features/profile/partials/profile.html index 7e0351d4af1..0330ee2fb17 100644 --- a/src/app/features/profile/partials/profile.html +++ b/src/app/features/profile/partials/profile.html @@ -1,4 +1,4 @@ - +
  • Overview
  • Change password
    • @@ -8,14 +8,14 @@
    -

    Personal information

    +

    Profile details

    • - Name + Name
    • @@ -23,10 +23,10 @@
    -
    +
    • - Email + Email
    • @@ -34,10 +34,10 @@
    -
    +
    • - Username + Username
    • @@ -45,23 +45,36 @@
    + +
    +
      +
    • + UI Theme +
      • +
    • + +
      • +
    +
    +
    +

    -

    Your Organizations

    +

    Organizations

    diff --git a/src/app/features/profile/profileCtrl.js b/src/app/features/profile/profileCtrl.js index e63d8a89a07..820866da6be 100644 --- a/src/app/features/profile/profileCtrl.js +++ b/src/app/features/profile/profileCtrl.js @@ -17,6 +17,7 @@ function (angular, config) { $scope.getUser = function() { backendSrv.get('/api/user').then(function(user) { $scope.user = user; + $scope.user.theme = user.theme || 'dark'; }); }; diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index c23daa77711..ff1fbad997d 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -142,7 +142,7 @@
    -
    +
    • Legend @@ -176,7 +176,7 @@
    -
    +
    • Legend values diff --git a/src/app/partials/dasheditor.html b/src/app/partials/dasheditor.html index 2dc2b18e523..a9de9af2acb 100644 --- a/src/app/partials/dasheditor.html +++ b/src/app/partials/dasheditor.html @@ -25,9 +25,6 @@
      -
      - -
      diff --git a/src/app/plugins/datasource/elasticsearch/partials/config.html b/src/app/plugins/datasource/elasticsearch/partials/config.html index dd2320d0d54..21b3d51e5cf 100644 --- a/src/app/plugins/datasource/elasticsearch/partials/config.html +++ b/src/app/plugins/datasource/elasticsearch/partials/config.html @@ -1,11 +1,15 @@ -
      -
      -
      Elastic search details
      -
      - - -
      -
      +

      Elastic search details

      + +
      +
        +
      • + Index name +
        • +
      • + +
        • +
      +
      diff --git a/src/app/plugins/datasource/influxdb_08/funcEditor.js b/src/app/plugins/datasource/influxdb_08/funcEditor.js index 615dcd2e75d..7d48f40792f 100644 --- a/src/app/plugins/datasource/influxdb_08/funcEditor.js +++ b/src/app/plugins/datasource/influxdb_08/funcEditor.js @@ -8,7 +8,7 @@ function (angular, _, $) { angular .module('grafana.directives') - .directive('influxdbFuncEditor', function($compile) { + .directive('influxdbFuncEditor08', function($compile) { var funcSpanTemplate = '{{target.function}}('; diff --git a/src/app/plugins/datasource/influxdb_08/partials/config.html b/src/app/plugins/datasource/influxdb_08/partials/config.html index a80b69afc18..b261ae7f79c 100644 --- a/src/app/plugins/datasource/influxdb_08/partials/config.html +++ b/src/app/plugins/datasource/influxdb_08/partials/config.html @@ -1,19 +1,37 @@ -
      -
      -
      InfluxDB Details
      -
      - - -
      -
      - - -
      -
      - - -
      -
      +

      InfluxDB Details

      + +
      +
        +
      • + Database +
        • +
      • + +
        • +
      +
      +
      +
      +
        +
      • + User +
        • +
      • + +
        • +
      +
      +
      +
      +
        +
      • + Password +
        • +
      • + +
        • +
      +
      diff --git a/src/app/plugins/datasource/influxdb_08/partials/query.editor.html b/src/app/plugins/datasource/influxdb_08/partials/query.editor.html index 23b8c27868c..a48cc30c509 100644 --- a/src/app/plugins/datasource/influxdb_08/partials/query.editor.html +++ b/src/app/plugins/datasource/influxdb_08/partials/query.editor.html @@ -117,7 +117,7 @@ select
    • - +
      • diff --git a/src/app/plugins/datasource/opentsdb/queryCtrl.js b/src/app/plugins/datasource/opentsdb/queryCtrl.js index cfa5647f2a0..576517a50b6 100644 --- a/src/app/plugins/datasource/opentsdb/queryCtrl.js +++ b/src/app/plugins/datasource/opentsdb/queryCtrl.js @@ -19,7 +19,7 @@ function (angular, _, kbn) { } if (!$scope.target.downsampleAggregator) { - $scope.target.downsampleAggregator = 'sum'; + $scope.target.downsampleAggregator = 'avg'; } $scope.$on('typeahead-updated', function() { diff --git a/src/css/less/tightform.less b/src/css/less/tightform.less index cfa70327331..bbad806823c 100644 --- a/src/css/less/tightform.less +++ b/src/css/less/tightform.less @@ -19,6 +19,12 @@ } } +.spaced-form { + .tight-form { + margin: 7px 0; + } +} + .borderless { .tight-form-item, .tight-form-input { @@ -140,13 +146,13 @@ input[type=text].tight-form-clear-input { [type=email], [type=number], [type=password] { - &.tight-form-input { border: none; border-right: 1px solid @grafanaTargetSegmentBorder; margin: 0px; border-radius: 0; - padding: 8px 4px; + padding: 18px 6px; + box-sizing: border-box; &.last { border-right: none; } @@ -163,7 +169,7 @@ select.tight-form-input { margin: 0px; border-radius: 0; height: 36px; - padding: 8px 5px; + padding: 8px 3px; &.last { border-right: none; } diff --git a/src/views/index.html b/src/views/index.html index d386f825d6d..c29fdd5a28a 100644 --- a/src/views/index.html +++ b/src/views/index.html @@ -7,7 +7,12 @@ Grafana - + [[if .User.LightTheme]] + + [[else]] + + [[end]] + @@ -19,14 +24,9 @@ - - - - -
    Name: {{org.name}} Role: {{org.role}} - + Current - + Select