diff options
| author | James Turnbull <james@lovedthanlost.net> | 2008-11-17 21:07:08 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2008-11-17 21:07:08 +1100 |
| commit | 030c7913643fa9b37b54815b09ee03427c4849ef (patch) | |
| tree | 3834503b0dc334aedbb7ac3978337ade348d1d11 /lib | |
| parent | dc192b00dc2c44b6174cb4a84663e8ad4e561d3c (diff) | |
| download | puppet-030c7913643fa9b37b54815b09ee03427c4849ef.tar.gz puppet-030c7913643fa9b37b54815b09ee03427c4849ef.tar.xz puppet-030c7913643fa9b37b54815b09ee03427c4849ef.zip | |
Moved RRD feature from util/metric.rb to feature/base.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/feature/base.rb | 3 | ||||
| -rw-r--r-- | lib/puppet/util/metric.rb | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/puppet/feature/base.rb b/lib/puppet/feature/base.rb index 0b12d730a..c3fb9a2f3 100644 --- a/lib/puppet/feature/base.rb +++ b/lib/puppet/feature/base.rb @@ -25,3 +25,6 @@ Puppet.features.add :diff, :libs => %w{diff/lcs diff/lcs/hunk} # We have augeas Puppet.features.add(:augeas, :libs => ["augeas"]) + +# We have RRD available +Puppet.features.add(:rrd, :libs => ["RRDtool"]) diff --git a/lib/puppet/util/metric.rb b/lib/puppet/util/metric.rb index e6d7678aa..f352462cd 100644 --- a/lib/puppet/util/metric.rb +++ b/lib/puppet/util/metric.rb @@ -4,11 +4,6 @@ require 'puppet' # A class for handling metrics. This is currently ridiculously hackish. class Puppet::Util::Metric - # Load the library as a feature, so we can test its presence. - # It's only used by this class, so there's no reason to move it - # to the main feature list. - Puppet.features.add :rrd, :libs => 'RRDtool' - attr_accessor :type, :name, :value, :label attr_writer :values |