Skip to content

N
nexpie-grafana-theme
Commit fd08c821 by Torkel Ödegaard
Options

Merge branch 'v3.0.x' 

Conflicts:
	package.json
parents 8a0d5aa3 c41c771e
Showing with 26 additions and 29 deletions
docs/sources/installation/debian.md
...@@ -10,13 +10,13 @@ page_keywords: grafana, installation, debian, ubuntu, guide ...@@ -10,13 +10,13 @@ page_keywords: grafana, installation, debian, ubuntu, guide
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable .deb for Debian-based Linux | [grafana_3.0.2-1463383025_amd64.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.2-1463383025_amd64.deb) Stable .deb for Debian-based Linux | [grafana_3.0.3-1463994644.deb](https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.3-1463994644_amd64.deb)
## Install Stable ## Install Stable
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.2-1463383025_amd64.deb $ wget https://grafanarel.s3.amazonaws.com/builds/grafana_3.0.3-1463994644_amd64.deb
$ sudo apt-get install -y adduser libfontconfig $ sudo apt-get install -y adduser libfontconfig
$ sudo dpkg -i grafana_3.0.2-1463383025_amd64.deb $ sudo dpkg -i grafana_3.0.3-1463994644_amd64.deb
## APT Repository ## APT Repository
......
docs/sources/installation/rpm.md
...@@ -10,24 +10,24 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide ...@@ -10,24 +10,24 @@ page_keywords: grafana, installation, centos, fedora, opensuse, redhat, guide
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-3.0.2-1463383025.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.2-1463383025.x86_64.rpm) Stable .RPM for CentOS / Fedora / OpenSuse / Redhat Linux | [grafana-3.0.3-1463994644.x86_64.rpm](https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.3-1463994644.x86_64.rpm)
## Install Stable Release from package file ## Install Stable Release from package file
You can install Grafana using Yum directly. You can install Grafana using Yum directly.
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.2-1463383025.x86_64.rpm $ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-3.0.3-1463994644.x86_64.rpm
Or install manually using `rpm`. Or install manually using `rpm`.
#### On CentOS / Fedora / Redhat: #### On CentOS / Fedora / Redhat:
$ sudo yum install initscripts fontconfig $ sudo yum install initscripts fontconfig
$ sudo rpm -Uvh grafana-3.0.2-1463383025.x86_64.rpm $ sudo rpm -Uvh grafana-3.0.3-1463994644.x86_64.rpm
#### On OpenSuse: #### On OpenSuse:
$ sudo rpm -i --nodeps grafana-3.0.2-1463383025.x86_64.rpm $ sudo rpm -i --nodeps grafana-3.0.3-1463994644.x86_64.rpm
## Install via YUM Repository ## Install via YUM Repository
......
docs/sources/installation/windows.md
...@@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide ...@@ -10,7 +10,7 @@ page_keywords: grafana, installation, windows guide
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable Zip package for Windows | [grafana.3.0.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.0.2.windows-x64.zip) Stable Zip package for Windows | [grafana.3.0.3.windows-x64.zip](https://grafanarel.s3.amazonaws.com/winbuilds/dist/grafana-3.0.3.windows-x64.zip)
## Configure ## Configure
......
packaging/publish/publish.sh
#! /usr/bin/env bash #! /usr/bin/env bash
deb_ver=3.0.1 deb_ver=3.0.3-1463994644
rpm_ver=3.0.1-1 rpm_ver=3.0.3-1463994644
#rpm_ver=3.0.0-1 wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
#wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb
package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/stable/debian/jessie grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm
#package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb
#wget https://grafanarel.s3.amazonaws.com/builds/grafana-${rpm_ver}.x86_64.rpm package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
#package_cloud push grafana/testing/el/6 grafana-${rpm_ver}.x86_64.rpm
#package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm package_cloud push grafana/stable/el/7 grafana-${rpm_ver}.x86_64.rpm
package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm package_cloud push grafana/stable/el/6 grafana-${rpm_ver}.x86_64.rpm
pkg/api/dashboard.go
...@@ -8,6 +8,7 @@ import ( ...@@ -8,6 +8,7 @@ import (
"github.com/grafana/grafana/pkg/api/dtos" "github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus" "github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/log"
"github.com/grafana/grafana/pkg/metrics" "github.com/grafana/grafana/pkg/metrics"
"github.com/grafana/grafana/pkg/middleware" "github.com/grafana/grafana/pkg/middleware"
m "github.com/grafana/grafana/pkg/models" m "github.com/grafana/grafana/pkg/models"
...@@ -167,14 +168,12 @@ func GetHomeDashboard(c *middleware.Context) { ...@@ -167,14 +168,12 @@ func GetHomeDashboard(c *middleware.Context) {
if prefsQuery.Result.HomeDashboardId != 0 { if prefsQuery.Result.HomeDashboardId != 0 {
slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId} slugQuery := m.GetDashboardSlugByIdQuery{Id: prefsQuery.Result.HomeDashboardId}
err := bus.Dispatch(&slugQuery) err := bus.Dispatch(&slugQuery)
if err != nil { if err == nil {
c.JsonApiErr(500, "Failed to get slug from database", err)
return
}
dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result} dashRedirect := dtos.DashboardRedirect{RedirectUri: "db/" + slugQuery.Result}
c.JSON(200, &dashRedirect) c.JSON(200, &dashRedirect)
return } else {
log.Warn("Failed to get slug from database, %s", err.Error())
}
} }
filePath := path.Join(setting.StaticRootPath, "dashboards/home.json") filePath := path.Join(setting.StaticRootPath, "dashboards/home.json")
......
public/app/plugins/panel/singlestat/module.ts
...@@ -275,13 +275,10 @@ class SingleStatCtrl extends MetricsPanelCtrl { ...@@ -275,13 +275,10 @@ class SingleStatCtrl extends MetricsPanelCtrl {
var panel = ctrl.panel; var panel = ctrl.panel;
var templateSrv = this.templateSrv; var templateSrv = this.templateSrv;
var data, linkInfo; var data, linkInfo;
var width, height;
var $panelContainer = elem.find('.panel-container'); var $panelContainer = elem.find('.panel-container');
elem = elem.find('.singlestat-panel'); elem = elem.find('.singlestat-panel');
function setElementHeight() { function setElementHeight() {
width = elem.width();
height = elem.height();
elem.css('height', ctrl.height + 'px'); elem.css('height', ctrl.height + 'px');
} }
...@@ -328,6 +325,9 @@ class SingleStatCtrl extends MetricsPanelCtrl { ...@@ -328,6 +325,9 @@ class SingleStatCtrl extends MetricsPanelCtrl {
} }
function addGauge() { function addGauge() {
var width = elem.width();
var height = elem.height();
ctrl.invalidGaugeRange = false; ctrl.invalidGaugeRange = false;
if (panel.gauge.minValue > panel.gauge.maxValue) { if (panel.gauge.minValue > panel.gauge.maxValue) {
ctrl.invalidGaugeRange = true; ctrl.invalidGaugeRange = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment