newrelic-elasticsearch 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3066767a18763e54c5f8bfbcba170ce1c47d7470
-  data.tar.gz: 21c5355934a6e2b8de09ae4e3f8fcdf4d546183f
+  metadata.gz: ff0277a9cfce36ea2c9b420c4cdf50b8f53e5a36
+  data.tar.gz: 32221514a558e500a6d490e876d7fb398420343c
 SHA512:
-  metadata.gz: 8d1b7bae4579942e68660cb53ffa8cb27966a651124d2284e4fcbe7103e0d9e4547e2c48c0148f4216f5c86a43cf4151bfe41638291000189809b1bf17e7086c
-  data.tar.gz: 196027f6d2006c93cc84ff3c9378a44fdbfc999519a536958291a4a4b06175b6a52c6b67df34323329ca2f8da7634984ff52d6b8daf8353ee001a78d4ceb954a
+  metadata.gz: c66bbacecbcddf4d70e3b379e32967f28f9c3ddd9b2dc724a2c26040d60eb9c49e089f5bcb13fd3fde2dc8b1ab3c6705da81f0c9c44c918f179635b4e6ab5eaf
+  data.tar.gz: e52cc838ced416aca539c40354c01ac78ce1fc1d189dc34465d769a76c78d79e436cedb284e50a714895d03485bbd34f4fea3b8c01eabfb0772132f5f9849374

data/README.md

@@ -9,7 +9,7 @@ to Elasticsearch queries.
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'new_relic-elasticsearch'
+gem 'newrelic-elasticsearch'
 ```
 
 And then execute:
@@ -18,7 +18,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install new_relic-elasticsearch
+    $ gem install newrelic-elasticsearch
 
 ## Usage
 

data/Rakefile

@@ -10,6 +10,7 @@ task :test do
   end
 end
 
+desc "Generate a new resolver class from the endpoint_list"
 task :generate_resolver do
   list = File.read(File.expand_path('test/endpoint_list.txt', __dir__))
 

data/lib/newrelic/elasticsearch/operation_resolver.rb

@@ -1,4 +1,15 @@
 class NewRelic::ElasticsearchOperationResolver
+  module Inflector
+    refine String do
+      def legalize
+        # elasticsearch indexes cannot have underscores in the name
+        # and datastore metrics cannot have dashes
+
+        self.split('-').map { |w| w[0].upcase + w[1..-1] }.join.gsub(/(Production)|(Staging)/,'')
+      end
+    end
+  end
+
   ELASTICSEARCH_OPERATION_NAMES =
     {
       [ "PUT", nil ] => :ambiguous_put_resolver,
@@ -21,7 +32,7 @@ class NewRelic::ElasticsearchOperationResolver
       [ "GET", "_cat" ] => :ambiguous_cat_resolver,
       [ "POST", "_close" ] => "CloseIndex",
       [ "POST", "_cluster" ] => "ClusterReroute",
-      [ "GET", "_cluster" ] => :ambigous_cluster_resolver,
+      [ "GET", "_cluster" ] => :ambiguous_cluster_resolver,
       [ "PUT", "_cluster" ] => "ClusterUpdateSettings",
       [ "GET", "_count" ] => "Count",
       [ "POST", "_count" ] => "Count",
@@ -107,6 +118,8 @@ class NewRelic::ElasticsearchOperationResolver
 
   attr_accessor :http_method, :path
 
+  using Inflector
+
   def initialize(http_method, path)
     @http_method = http_method
     @path = path
@@ -152,11 +165,12 @@ class NewRelic::ElasticsearchOperationResolver
   end
 
   def index
-    scope[0]
+    index = scope[0]
+    index.legalize unless index.start_with?('_')
   end
 
   def type
-    scope[1]
+    scope[1].legalize
   end
 
   def id
@@ -190,7 +204,7 @@ class NewRelic::ElasticsearchOperationResolver
   end
 
   def ambiguous_nodes_resolver
-    "Node" + operands[1..-1].map(&:capitalize).join
+    "Node" + operands[1..-1].map{ |s| s.legalize }.join
   end
 
   def ambiguous_percolate_resolver
@@ -202,7 +216,7 @@ class NewRelic::ElasticsearchOperationResolver
   end
 
   def ambiguous_stats_resolver
-    "Indicies" + operands.map(&:capitalize).join
+    "Indicies" + operands.map { |s| s.legalize }.join
   end
 
   def ambiguous_cluster_resolver

data/lib/newrelic/elasticsearch/version.rb

@@ -1,5 +1,5 @@
 module NewRelic
   module Elasticsearch
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic-elasticsearch
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Stephen Prater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler