Merge remote-tracking branch 'github/pull/701'

[chef.git] / roles / base.rb

diff --git a/roles/base.rb b/roles/base.rb
index d37a4097da0e571e627665f1912870a92b5f432d..718b288a5a5b530bab46d60228dcb45506902b00 100644 (file)
--- a/roles/base.rb
+++ b/roles/base.rb
@@ -10,13 +10,6 @@ default_attributes(
       :jburgess => { :status => :administrator }
     }
   },
       :jburgess => { :status => :administrator }
     }
   },

-  :munin => {
-    :plugins => {
-      :chrony => {
-        :systime => { :warning => "100", :critical => "250" }
-      }
-    }
-  },

   :networking => {
     :roles => {
       :internal => { :metric => 200 },
   :networking => {
     :roles => {
       :internal => { :metric => 200 },


@@ -95,7 +88,6 @@ run_list(
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[prometheus]",
   "recipe[devices]",
   "recipe[hardware]",
   "recipe[prometheus]",

-  "recipe[munin::plugins]",

   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",
   "recipe[networking]",
   "recipe[exim]",
   "recipe[ntp]",