Bump version 1.0.4 with grafana 1.5.4

sous-chefs · May 18, 2014 · ed3a90b · ed3a90b
1 parent d3fbce7
commit ed3a90b
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 14 deletions.
diff --git a/Berksfile b/Berksfile
@@ -1,3 +1,5 @@
+source "https://api.berkshelf.com"
+
 metadata
 
 cookbook 'apt'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ This file is used to list changes made in each version of grafana.
 
 ## Dev:
 
+* Update config.js based on the one in 1.5.4
+* Update to grafana 1.5.4
+* Update to new download URL
+
 ## 1.0.3:
 
 * Add some basic specs, foodcritic, knife test and enable TravisCI

diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf', '~> 2.0'
+gem 'berkshelf', '~> 3.0'
 
 group :test do
   gem 'chefspec'

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,10 +3,10 @@
 default['grafana']['git']['branch'] = "master"
 default['grafana']['git']['type'] = "sync" # checkout | sync
 default['grafana']['file']['type'] = "zip" # zip
-default['grafana']['file']['version'] = '1.5.2'
+default['grafana']['file']['version'] = '1.5.4'
 f = node['grafana']['file']
-default['grafana']['file']['url'] = "https://github.com/torkelo/grafana/releases/download/v#{f['version']}/grafana-#{f['version']}.#{f['type']}"
-default['grafana']['file']['checksum'] = "877241e628b75a997a579c9a7618581cc53bc6bacbc6c87005f6974fdf0fa136" # sha256 ( shasum -a 256 FILENAME )
+default['grafana']['file']['url'] = "http://grafanarel.s3.amazonaws.com/grafana-#{f['version']}.#{f['type']}"
+default['grafana']['file']['checksum'] = "fee7334efba967142955be2fa39ecae7bca0cc9b7a76c301430746be4fc7ec6d" # sha256 ( shasum -a 256 FILENAME )
 default['grafana']['webserver'] = "nginx"
 default['grafana']['install_path'] = "/opt"
 default['grafana']['install_dir'] = "#{node['grafana']['install_path']}/grafana"

diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license          'Apache 2.0'
 description      'Installs/Configures grafana'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.0.3'
+version          '1.0.4'
 
 %w{git nginx ark}.each do |cb|
   depends cb

diff --git a/templates/default/config.js.erb b/templates/default/config.js.erb
@@ -5,6 +5,7 @@
  */
 define(['settings'],
 function (Settings) {
+  // "use strict";
 
   return new Settings({
 
@@ -24,24 +25,47 @@ function (Settings) {
     graphiteUrl: window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/_graphite",
 
     /**
-     * Multiple graphite servers? Comment out graphiteUrl and replace with
-     *
-     *  datasources: {
-     *    data_center_us: { type: 'graphite',  url: 'http://<graphite_url>',  default: true },
-     *    data_center_eu: { type: 'graphite',  url: 'http://<graphite_url>' }
-     *  }
-     */
+     * Multiple graphite servers? Comment out graphiteUrl and replace with something like this:
+
+      datasources: {
+        data_center_us: {
+          type: 'graphite',
+          url: 'http://<graphite_url>',
+          default: true
+        },
+        data_center_eu: {
+          type: 'graphite',
+          url: 'http://<graphite_url>',
+          render_method: 'GET' // optional, use this to change render calls from POST to GET
+        }
+      },
+    */
 
     default_route: '/dashboard/file/default.json',
 
     /**
-     * If your graphite server has another timezone than you & users browsers specify the offset here
-     * Example: "-0500" (for UTC - 5 hours)
+     * If you experiance problems with zoom, it is probably caused by timezone diff between
+     * your browser and the graphite-web application. timezoneOffset setting can be used to have Grafana
+     * translate absolute time ranges to the graphite-web timezone.
+     * Example:
+     *   If TIME_ZONE in graphite-web config file local_settings.py is set to America/New_York, then set
+     *   timezoneOffset to "-0500" (for UTC - 5 hours)
+     * Example:
+     *   If TIME_ZONE is set to UTC, set this to "0000"
      */
     timezoneOffset: "<%= node['grafana']['timezone_offset'] %>",
 
+    /**
+     * Elasticsearch index for storing dashboards
+     *
+     */
     grafana_index: "grafana-dash",
 
+    /**
+     * set to false to disable unsaved changes warning
+     */
+    unsaved_changes_warning: true,
+
     panel_names: [
       'text',
       'graphite'