Bump version to 1.0.1 / grafana 1.5.0

sous-chefs · Mar 10, 2014 · af52122 · af52122
1 parent f20b16d
commit af52122
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 26 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -19,6 +19,8 @@ suites:
       grafana:
         install_type: file
         webserver_port: 8080
+        nginx:
+          webserver_aliases: "grafana.dev"
     run_list:
       - recipe[apt::default]
       - recipe[java::default]

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This file is used to list changes made in each version of grafana.
 
+## 1.0.1:
+
+* Update file release to 1.5.0
+
 ## 1.0.0:
 
 * Initial release of grafana
diff --git a/README.md b/README.md
@@ -72,34 +72,16 @@ If you would like to modify the `nginx` parameters, you should:
 
 Testing
 -------
-#### Vagrant
+#### kitchen-test
 
 Requires Vagrant >= 1.2 with the following plugins :
 
 * vagrant-berkshef
 * vagrant-omnibus
 
-```
-$ vagrant up ubuntu1204
-```
-
-If you get the following error then run `vagrant provision ubuntu1204`.  For some reason on my box it's occasionally failing to launch the shell provisioner.
-
-```
-[ubuntu1204] Running: inline script
-stdin: is not a tty
-The following SSH command responded with a non-zero exit status.
-Vagrant assumes that this means the command failed!
-
-chmod +x /tmp/vagrant-shell && /tmp/vagrant-shell
-```
-
-#### Strainer
-
 ```
 $ bundle install
-$ bundle exec berks install
-$ bundle exec strainer test
+$ kitchen test
 ```
 
 Contributing

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -3,8 +3,8 @@
 default['grafana']['git']['branch'] = "master"
 default['grafana']['git']['type'] = "sync" # checkout | sync
 default['grafana']['file']['type'] = "zip" # zip
-default['grafana']['file']['url'] = "https://github.com/torkelo/grafana/releases/download/v1.4.0/grafana-1.4.0.zip"
-default['grafana']['file']['checksum'] = "40466d58a257c7daf9f0ef87147356d3f1cfdfcb27c5a97c404a508dd101d9e7" # sha256 ( shasum -a 256 FILENAME )
+default['grafana']['file']['url'] = "https://github.com/torkelo/grafana/releases/download/v1.5.0/grafana-1.5.0.zip"
+default['grafana']['file']['checksum'] = "3f8f86231df130d8c3cb2117e01418d645647732da31cbcec3d252186caf7670" # sha256 ( shasum -a 256 FILENAME )
 default['grafana']['webserver'] = "nginx"
 default['grafana']['install_path'] = "/opt"
 default['grafana']['install_dir'] = "#{node['grafana']['install_path']}/grafana"
@@ -28,3 +28,4 @@
 default['grafana']['webserver_listen'] = node.ipaddress
 default['grafana']['webserver_port'] = 80
 default['grafana']['webserver_scheme'] = "http://"
+default['grafana']['timezone_offset'] = "null" # Example: "-0500" (for UTC - 5 hours)
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.0'
+version          '1.0.1'
 
 %w{git nginx ark}.each do |cb|
   depends cb

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -33,9 +33,9 @@
 if node['grafana']['user'].empty?
   unless node['grafana']['webserver'].empty?
     webserver = node['grafana']['webserver']
-    kibana_user = node[webserver]['user']
+    grafana_user = node[webserver]['user']
   else
-    kibana_user = "nobody"
+    grafana_user = "nobody"
   end
 else
   grafana_user = node['grafana']['user']

diff --git a/templates/default/config.js.erb b/templates/default/config.js.erb
@@ -39,7 +39,7 @@ function (Settings) {
      * If your graphite server has another timezone than you & users browsers specify the offset here
      * Example: "-0500" (for UTC - 5 hours)
      */
-    timezoneOffset: null,
+    timezoneOffset: <%= node['grafana']['timezone_offset'] %>,
 
     grafana_index: "grafana-dash",