IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(annotations): make sure a data source that supports annotations is used in annotation editor when creating new

Browse Source
This commit is contained in:
Torkel Ödegaard 2016-04-12 10:16:40 -04:00
parent 917fabbc9b
commit 905d31442c
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
packaging/publish/publish.sh
View File

@ -1,22 +1,22 @@
#! /usr/bin/env bash #! /usr/bin/env bash
deb_ver=3.0.0-beta31460381868 deb_ver=3.0.0-beta31460467884
rpm_ver=3.0.0-beta31460381868 rpm_ver=3.0.0-beta31460467884
#rpm_ver=3.0.0-1 #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/jessie grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb #package_cloud push grafana/stable/debian/wheezy grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb # package_cloud push grafana/testing/debian/jessie grafana_${deb_ver}_amd64.deb
#package_cloud push grafana/testing/debian/wheezy grafana_${deb_ver}_amd64.deb 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 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/6 grafana-${rpm_ver}.x86_64.rpm
#package_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm ackage_cloud push grafana/testing/el/7 grafana-${rpm_ver}.x86_64.rpm
# package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm # package_cloud push grafana/stable/el/7 grafana-${version}-1.x86_64.rpm
# package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm # package_cloud push grafana/stable/el/6 grafana-${version}-1.x86_64.rpm

1
public/app/features/annotations/editor_ctrl.js
View File

@ -45,6 +45,7 @@ function (angular, _, $) {
$scope.reset = function() { $scope.reset = function() {
$scope.currentAnnotation = angular.copy(annotationDefaults); $scope.currentAnnotation = angular.copy(annotationDefaults);
$scope.currentAnnotation.datasource = $scope.datasources[0].name;
$scope.currentIsNew = true; $scope.currentIsNew = true;
$scope.datasourceChanged(); $scope.datasourceChanged();
}; };

3
public/app/plugins/datasource/cloudwatch/partials/annotations.editor.html
View File

@ -1,5 +1,6 @@
<cloudwatch-query-parameter target="ctrl.annotation" datasource="ctrl.datasource"></cloudwatch-query-parameter> <cloudwatch-query-parameter target="ctrl.annotation" datasource="ctrl.datasource"></cloudwatch-query-parameter>
<div class="editor-row">
<div class="editor-row" style="padding: 2rem 0">
<div class="section"> <div class="section">
<h5>Prefix matching</h5> <h5>Prefix matching</h5>
<div class="editor-option"> <div class="editor-option">