newrelic_ia 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.2.2 2010-04-14
+
+* Minor bug fixes
+* Change options for install
+
 == 0.2.1 2010-04-14
 
 * Bug in --install, didn't work for REE

data/README.rdoc

@@ -99,10 +99,10 @@ Liquid template for NewRelic custom dashboard:
 
     <div>
         <div style="float: left; width: 50%;">
-            {% line_chart value:average_value title:'Cache Miss Ratio' metric:'System/Memcached/Miss Ratio' simple_tooltip:true label:segment_3 value_suffix:'%' %}
+            {% line_chart value:average_value title:'Cache Miss Ratio' metric:'System/Memcached/all/miss_ratio' simple_tooltip:true label:segment_3 value_suffix:'%' %}
         </div>
         <div style="float: left; width: 50%;">
-            {% line_chart value:average_value title:'Cache Memory' regexp:'System/Memcached/(Bytes|Free Bytes|Limit Maxbytes)' simple_tooltip:true label:segment_3 %}
+            {% line_chart value:average_value title:'Cache Memory' regexp:'System/Memcached/all/(bytes|free_bytes|limit_maxbytes)' simple_tooltip:true label:segment_3 %}
         </div>
         <br style="clear: both" />
     </div>
@@ -111,10 +111,10 @@ Liquid template for NewRelic custom dashboard:
     
     <div>
         <div style="float: left; width: 50%;">
-            {% line_chart value:average_value title:'Cache Gets & Sets' regexp:'System/Memcached/(Gpm|Spm)' simple_tooltip:true label:segment_3 %}
+            {% line_chart value:average_value title:'Cache Gets & Sets' regexp:'System/Memcached/all/(gpm|spm)' simple_tooltip:true label:segment_3 %}
         </div>
         <div style="float: left; width: 50%;">
-            {% line_chart value:average_value title:'Cache Misses, Flushes, & Evictions' regexp:'System/Memcached/(Mpm|Epm|Fpm)' simple_tooltip:true label:segment_3 %}
+            {% line_chart value:average_value title:'Cache Misses, Flushes, & Evictions' regexp:'System/Memcached/all/(mpm|epm|fpm)' simple_tooltip:true label:segment_3 %}
         </div>
         <br style="clear: both" />
     </div>
@@ -123,10 +123,10 @@ Liquid template for NewRelic custom dashboard:
     
     <div>
         <div style="float: left; width: 50%;">
-        {% line_chart value:average_value title:'Active Connections' metric:'System/Memcached/Curr Connections' simple_tooltip:true hide_legend:true %}
+        {% line_chart value:average_value title:'Active Connections' metric:'System/Memcached/all/curr_connections' simple_tooltip:true hide_legend:true %}
         </div>
         <div style="float: left; width: 50%;">
-        {% line_chart value:average_value title:'Cache Objects' metric:'System/Memcached/Curr Items' simple_tooltip:true hide_legend:true %}
+        {% line_chart value:average_value title:'Cache Objects' metric:'System/Memcached/all/curr_items' simple_tooltip:true hide_legend:true %}
         </div>
         <br style="clear: both" />
     </div>

data/lib/new_relic/ia/cli.rb

@@ -23,6 +23,7 @@ module NewRelic::IA
       # Run the command line args.  Return nil if running
       # or an exit status if not.
       def execute(stdout, arguments=[])
+        log.level = Logger::INFO
         @aspects = []
         parser = OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^ */,'')
@@ -42,8 +43,8 @@ module NewRelic::IA
                   "quiet output") { NewRelic::IA::CLI.log.level = Logger::ERROR }
           opts.on("-e", "--environment=ENV",
                   "use ENV section in newrelic.yml") { |e| @env = e }
-          opts.on("--install",
-                  "create a default newrelic.yml") { |e| return self.install(stdout) }
+          opts.on("--install license_key",
+                  "create a default newrelic.yml") { |key| return self.install(key, stdout) }
           
           opts.on("-h", "--help",
                   "Show this help message.") { stdout.puts "#{opts}\n"; return 0 }
@@ -128,7 +129,7 @@ module NewRelic::IA
       end
     end
     
-    def self.install stdout
+    def self.install license_key, stdout
       require_newrelic_rpm
       if NewRelic::VersionNumber.new(NewRelic::VERSION::STRING) < '2.12'
         if File.exists? "newrelic.yml"
@@ -145,7 +146,9 @@ module NewRelic::IA
           require 'new_relic/command'
           cmd = NewRelic::Command::Install.new \
           :src_file => File.join(File.dirname(__FILE__), "newrelic.yml"),
-          :generated_for_user => "Generated on #{Time.now.strftime('%b %d, %Y')}, from version #{NewRelic::IA::VERSION}"
+          :generated_for_user => "Generated on #{Time.now.strftime('%b %d, %Y')}, from version #{NewRelic::IA::VERSION}",
+          :app_name => 'System Monitor',
+          :license_key => license_key
           cmd.run 
           0 # normal
         rescue NewRelic::Command::CommandFailure => e

data/lib/new_relic/ia/version.rb

@@ -1,5 +1,5 @@
 module NewRelic
   module IA
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/spec/cli_spec.rb

@@ -3,9 +3,11 @@ require 'new_relic/ia/cli'
 require 'new_relic/ia/iostat_reader'
 require 'new_relic/ia/disk_sampler'
 require 'new_relic/ia/memcached_sampler'
+
 describe NewRelic::IA::CLI, "execute" do
   before(:each) do
     @stdout_io = StringIO.new
+    NewRelic::Agent::Agent.any_instance.stubs(:connected?).returns(true)
   end
   it "should print help" do
     NewRelic::IA::CLI.execute(@stdout_io, [ "-h"])
@@ -30,6 +32,7 @@ describe NewRelic::IA::CLI, "execute" do
   end
   it "should start memcached" do
     NewRelic::Agent::StatsEngine.any_instance.expects(:add_harvest_sampler)
+    NewRelic::IA::MemcachedSampler.any_instance.stubs(:check)
     stat = NewRelic::IA::CLI.execute(@stdout_io, [ "memcached"])
     stat.should == nil
   end
@@ -38,4 +41,7 @@ describe NewRelic::IA::CLI, "execute" do
     stat.should == nil
     NewRelic::Control.instance.env.should == "production"
   end
-end
+  it "should install a newrelic.yml" do
+    NewRelic::IA::CLI.execute(@stdout_io, ["--install", "01234567"])
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -07:00
+date: 2010-04-14 00:00:00 -07:00
 default_executable: newrelic_ia
 dependencies: 
 - !ruby/object:Gem::Dependency