Merge branch 'grafana-2'

Resolved Conflicts:
	README.md

.kitchen.yml

@@ -1,92 +1,60 @@
 ---
 driver:
   name: vagrant
-  require_chef_omnibus: "latest"
+  require_chef_omnibus: '12.3.0'
   customize:
     memory: 1024
     cpus: 2
     cpuexecutioncap: 80
 
 provisioner:
-  name: chef_solo
+  name: chef_zero
 
 platforms:
   - name: ubuntu-12.04
     run_list:
       - recipe[apt::default]
-    attributes:
-      java:
-        jdk_version: "7"
-      graphite:
-        listen_port: 8081
-        uwsgi:
-          listen_http: true
-      grafana:
-        graphite_port: 8081
-        webserver_aliases:
-          - grafana.dev
+      - recipe[curl::default]
   - name: ubuntu-14.04
     run_list:
       - recipe[apt::default]
+      - recipe[curl::default]
     attributes:
-      java:
-        jdk_version: "7"
-      graphite:
-        listen_port: 8081
-        uwsgi:
-          listen_http: true
       grafana:
-        graphite_port: 8081
-        webserver_aliases:
-          - grafana.dev
-  - name: debian-7.0
+        webserver_listen: ''
+  - name: debian-7.4
+    driver:
+      box: debian-7.4.0
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_debian-7.4_chef-provisionerless.box
     run_list:
       - recipe[apt::default]
-    attributes:
-      java:
-        jdk_version: "7"
-      graphite:
-        listen_port: 8081
-        uwsgi:
-          listen_http: true
-      grafana:
-        graphite_port: 8081
-        webserver_aliases:
-          - grafana.dev
+      - recipe[curl::default]
   - name: centos-6.4
-    attributes:
-      java:
-        jdk_version: "7"
-      graphite:
-        listen_port: 8081
-        uwsgi:
-          listen_http: true
-      grafana:
-        graphite_port: 8081
-        webserver_aliases:
-          - grafana.dev
-      yum:
-        epel:
-          gpgkey: 'http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-6'
-          mirrorlist: 'http://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch'
+    driver:
+      box: centos-6.4
+      box_url: https://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_centos-6.4_chef-provisionerless.box
 
 suites:
   - name: default
     run_list:
-      - recipe[java::default]
-      - recipe[elasticsearch::default]
-      - recipe[graphite::carbon]
-      - recipe[graphite::web]
-      - recipe[graphite::uwsgi]
       - recipe[grafana::default]
-  - name: git
     attributes:
       grafana:
-        install_type: git
+        ini:
+          server:
+            http_addr: '127.0.0.1'
+  - name: package
     run_list:
-      - recipe[java::default]
-      - recipe[elasticsearch::default]
-      - recipe[graphite::carbon]
-      - recipe[graphite::web]
-      - recipe[graphite::uwsgi]
       - recipe[grafana::default]
+    attributes:
+      grafana:
+        install_type: package
+        ini:
+          server:
+            http_port: 3015
+  # - name: source
+  #   run_list:
+  #     - recipe[grafana::default]
+  #   attributes:
+  #     grafana:
+  #       install_type: source

.rubocop.yml

@@ -7,29 +7,35 @@ AllCops:
 AlignParameters:
   Enabled: false
 
-Encoding:
-  Enabled: false
-
 LineLength:
   Max: 200
 
 Documentation:
   Enabled: false
 
+Metrics/AbcSize:
+  Max: 40
+
+Metrics/MethodLength:
+  Max: 30
+
+Metrics/ModuleLength:
+  Max: 120
+
 Style/AsciiComments:
   Enabled: false
 
-Style/MethodLength:
+Style/FileName:
   Enabled: false
 
-Style/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: no_space
-
-Style/SpaceAfterComma:
+Style/Next:
   Enabled: false
 
-Style/SpaceAroundOperators:
+Style/NumericLiterals:
   Enabled: false
 
-Style/Lambda:
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+
+Style/SignalException:
   Enabled: false

Berksfile

@@ -2,12 +2,9 @@ source 'https://api.berkshelf.com'
 
 metadata
 
-cookbook 'apt'
 cookbook 'nginx', '>= 2.5'
 cookbook 'git'
 cookbook 'java'
-cookbook 'ark', '>= 0.7.2'
-cookbook 'graphite', '~> 1.0.2'
 cookbook 'build-essential'
-
-cookbook 'elasticsearch', git: 'git://github.com/elastic/cookbook-elasticsearch.git'
+cookbook 'curl'
+cookbook 'yum-epel'

Gemfile

@@ -1,17 +1,25 @@
 source 'https://rubygems.org'
 
-gem 'berkshelf', '~> 3.1'
+gem 'berkshelf', '~> 3.2'
 gem 'rake'
 gem 'emeril'
 
 group :test do
-  gem 'chefspec', '~> 4.0'
+  gem 'chefspec', '~> 4.2'
   gem 'foodcritic', '~> 4.0.0'
-  gem 'rubocop', '= 0.25'
+  gem 'rubocop', '= 0.31'
   gem 'strainer'
 end
 
 group :integration do
   gem 'test-kitchen'
   gem 'kitchen-vagrant'
 end
+
+group :development do
+  gem 'rb-readline'
+  gem 'guard', '2.4'
+  gem 'guard-foodcritic'
+  gem 'guard-rspec', '~> 4.2.6'
+  gem 'guard-rubocop'
+end

Guardfile

@@ -0,0 +1,20 @@
+guard 'foodcritic', cookbook_paths: '.' do
+  watch(%r{^attributes\/(.+)\.rb})
+  watch(%r{^libraries\/(.+)\.rb})
+  watch(%r{^recipes\/(.+)\.rb})
+  watch('metadata.rb')
+end
+
+guard 'rubocop' do
+  watch(%r{^attributes\/(.+)\.rb})
+  watch(%r{^libraries\/(.+)\.rb})
+  watch(%r{^recipes\/(.+)\.rb})
+  watch('metadata.rb')
+end
+
+guard :rspec, cmd: 'rspec --color' do
+  watch(%r{^libraries\/(.+)\.rb})
+  watch(%r{^spec\/(.+)_spec\.rb})
+  watch(%r{^recipes\/(.+)\.rb})   { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')      { 'spec' }
+end