Commit 1507d6c8 by Torkel Ödegaard

Merge branch 'master' of github.com:grafana/grafana

parents 4c5bdd9d 48fbd7e1
# 4.1-beta (unreleased) # 4.1-beta1 (2016-12-20)
### Enhancements ### Enhancements
* **Postgres**: Add support for Certs for Postgres database [#6655](https://github.com/grafana/grafana/issues/6655) * **Postgres**: Add support for Certs for Postgres database [#6655](https://github.com/grafana/grafana/issues/6655)
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* **Alerting**: Adds OK as no data option. [#6866](https://github.com/grafana/grafana/issues/6866) * **Alerting**: Adds OK as no data option. [#6866](https://github.com/grafana/grafana/issues/6866)
* **Alert list**: Order alerts based on state. [#6676](https://github.com/grafana/grafana/issues/6676) * **Alert list**: Order alerts based on state. [#6676](https://github.com/grafana/grafana/issues/6676)
* **Alerting**: Add api endpoint for pausing all alerts. [#6589](https://github.com/grafana/grafana/issues/6589) * **Alerting**: Add api endpoint for pausing all alerts. [#6589](https://github.com/grafana/grafana/issues/6589)
* **Panel**: Added help text for panels. [#4079](https://github.com/grafana/grafana/issues/4079), thx [@utkarshcmu](https://github.com/utkarshcmu)
### Bugfixes ### Bugfixes
* **API**: HTTP API for deleting org returning incorrect message for a non-existing org [#6679](https://github.com/grafana/grafana/issues/6679) * **API**: HTTP API for deleting org returning incorrect message for a non-existing org [#6679](https://github.com/grafana/grafana/issues/6679)
......
...@@ -158,7 +158,7 @@ parent = "http_api" ...@@ -158,7 +158,7 @@ parent = "http_api"
HTTP/1.1 200 HTTP/1.1 200
Content-Type: application/json Content-Type: application/json
{"id":1,"message":"Datasource added"} {"id":1,"message":"Datasource added", "name": "test_datasource"}
## Update an existing data source ## Update an existing data source
...@@ -193,7 +193,7 @@ parent = "http_api" ...@@ -193,7 +193,7 @@ parent = "http_api"
HTTP/1.1 200 HTTP/1.1 200
Content-Type: application/json Content-Type: application/json
{"message":"Datasource updated"} {"message":"Datasource updated", "id": 1, "name": "test_datasource"}
## Delete an existing data source ## Delete an existing data source
......
...@@ -16,6 +16,7 @@ weight = 1 ...@@ -16,6 +16,7 @@ weight = 1
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable for Debian-based Linux | [4.0.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.2-1481203731_amd64.deb) Stable for Debian-based Linux | [4.0.2 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.0.2-1481203731_amd64.deb)
Latest beta for Debian-based Linux | [4.1.0-beta1 (x86-64 deb)](https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1482230757beta1_amd64.deb)
## Install Stable ## Install Stable
...@@ -25,6 +26,12 @@ $ sudo apt-get install -y adduser libfontconfig ...@@ -25,6 +26,12 @@ $ sudo apt-get install -y adduser libfontconfig
$ sudo dpkg -i grafana_4.0.2-1481203731_amd64.deb $ sudo dpkg -i grafana_4.0.2-1481203731_amd64.deb
``` ```
## Install Latest Beta
$ wget https://grafanarel.s3.amazonaws.com/builds/grafana_4.1.0-1482230757beta1_amd64.deb
$ sudo apt-get install -y adduser libfontconfig
$ sudo dpkg -i grafana_4.1.0-1482230757beta1_amd64.deb
## APT Repository ## APT Repository
Add the following line to your `/etc/apt/sources.list` file. Add the following line to your `/etc/apt/sources.list` file.
......
...@@ -16,6 +16,7 @@ weight = 2 ...@@ -16,6 +16,7 @@ weight = 2
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2-1481203731.x86_64.rpm) Stable for CentOS / Fedora / OpenSuse / Redhat Linux | [4.0.2 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2-1481203731.x86_64.rpm)
Latest beta for CentOS / Fedora / OpenSuse / Redhat Linux | [4.1.0-beta1 (x86-64 rpm)](https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1482230757beta1.x86_64.rpm)
## Install Stable ## Install Stable
...@@ -34,6 +35,21 @@ Or install manually using `rpm`. ...@@ -34,6 +35,21 @@ Or install manually using `rpm`.
$ sudo rpm -i --nodeps grafana-4.0.2-1481203731.x86_64.rpm $ sudo rpm -i --nodeps grafana-4.0.2-1481203731.x86_64.rpm
## Or Install Latest Beta
$ sudo yum install https://grafanarel.s3.amazonaws.com/builds/grafana-4.1.0-1482230757beta1.x86_64.rpm
Or install manually using `rpm`.
#### On CentOS / Fedora / Redhat:
$ sudo yum install initscripts fontconfig
$ sudo rpm -Uvh grafana-4.1.0-1482230757beta1.x86_64.rpm
#### On OpenSuse:
$ sudo rpm -i --nodeps grafana-4.1.0-1482230757beta1.x86_64.rpm
## Install via YUM Repository ## Install via YUM Repository
Add the following to a new file at `/etc/yum.repos.d/grafana.repo` Add the following to a new file at `/etc/yum.repos.d/grafana.repo`
......
...@@ -14,6 +14,7 @@ weight = 3 ...@@ -14,6 +14,7 @@ weight = 3
Description | Download Description | Download
------------ | ------------- ------------ | -------------
Latest stable package for Windows | [grafana.4.0.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2.windows-x64.zip) Latest stable package for Windows | [grafana.4.0.2.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/grafana-4.0.2.windows-x64.zip)
Latest beta package for Windows | [grafana.4.1.0-beta1.windows-x64.zip](https://grafanarel.s3.amazonaws.com/builds/)
## Configure ## Configure
......
#! /usr/bin/env bash #! /usr/bin/env bash
deb_ver=4.0.2-1481203731 deb_ver=4.1.0-1482230757beta1
rpm_ver=4.0.2-1481203731 rpm_ver=4.1.0-1482230757beta1
wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb wget https://grafanarel.s3.amazonaws.com/builds/grafana_${deb_ver}_amd64.deb
......
...@@ -100,7 +100,7 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) { ...@@ -100,7 +100,7 @@ func AddDataSource(c *middleware.Context, cmd m.AddDataSourceCommand) {
return return
} }
c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id}) c.JSON(200, util.DynMap{"message": "Datasource added", "id": cmd.Result.Id, "name": cmd.Result.Name})
} }
func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Response { func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Response {
...@@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp ...@@ -117,7 +117,7 @@ func UpdateDataSource(c *middleware.Context, cmd m.UpdateDataSourceCommand) Resp
return ApiError(500, "Failed to update datasource", err) return ApiError(500, "Failed to update datasource", err)
} }
return Json(200, util.DynMap{"message": "Datasource updated"}) return Json(200, util.DynMap{"message": "Datasource updated", "id": cmd.Id, "name": cmd.Name})
} }
func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error { func fillWithSecureJsonData(cmd *m.UpdateDataSourceCommand) error {
......
...@@ -5,5 +5,5 @@ _token=$1 ...@@ -5,5 +5,5 @@ _token=$1
curl \ curl \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
-H "Authorization: Bearer ${_token}" \ -H "Authorization: Bearer ${_token}" \
-X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "v4.0.x","environmentVariables": {}}' \ -X POST -d '{ "accountName": "Torkeldegaard", "projectSlug": "grafana","branch": "master","environmentVariables": {}}' \
https://ci.appveyor.com/api/builds https://ci.appveyor.com/api/builds
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