Merge pull request #51 from DataDog/remh/sc_tags

Only send instance name in service check tags
DataDog · Apr 8, 2015 · c6bb3ee · c6bb3ee
2 parents 56d092f + 044062c
commit c6bb3ee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/src/main/java/org/datadog/jmxfetch/Instance.java b/src/main/java/org/datadog/jmxfetch/Instance.java
@@ -270,23 +270,9 @@ private void refreshBeansList() throws IOException {
     }
 
     public String[] getServiceCheckTags() {
-        LinkedHashMap<String, Object> yaml = this.getYaml();
-        List<String> tags = new ArrayList<String>();
-        LinkedHashMap<String, String> instanceTags;
-        instanceTags = (LinkedHashMap<String, String>) yaml.get("tags");
-        if (instanceTags != null) {
-            for (Map.Entry<String, String> tag : instanceTags.entrySet()) {
-                tags.add(tag.getKey() + ":" + tag.getValue());
-            }
-        }
-
-        if (yaml.get("process_name_regex") != null) {
-            tags.add("process:" + yaml.get("process_name_regex"));
-        }
-        if (yaml.get("port") != null) {
-            tags.add("port:" + yaml.get("port"));
-        }
 
+        List<String> tags = new ArrayList<String>();
+        tags.add("instance:" + this.instanceName);
         return tags.toArray(new String[tags.size()]);
     }
 

diff --git a/src/test/java/org/datadog/jmxfetch/TestApp.java b/src/test/java/org/datadog/jmxfetch/TestApp.java
@@ -276,10 +276,8 @@ public void testServiceCheckOK() throws Exception {
 
         assertEquals("jmx", scName);
         assertEquals(Status.STATUS_OK, scStatus);
-        assertEquals(scTags.length, 3);
-        assertTrue(Arrays.asList(scTags).contains("env:stage"));
-        assertTrue(Arrays.asList(scTags).contains("newTag:test"));
-        assertTrue(Arrays.asList(scTags).contains("process:.*surefire.*"));
+        assertEquals(scTags.length, 1);
+        assertTrue(Arrays.asList(scTags).contains("instance:jmx_test_instance"));
         mbs.unregisterMBean(objectName);
     }
 
@@ -324,10 +322,8 @@ public void testServiceCheckWarning() throws Exception {
         assertEquals("too_many_metrics", scName);
         // We should have a warning status
         assertEquals(Status.STATUS_WARNING, scStatus);
-        assertEquals(scTags.length, 3);
-        assertTrue(Arrays.asList(scTags).contains("env:stage"));
-        assertTrue(Arrays.asList(scTags).contains("newTag:test"));
-        assertTrue(Arrays.asList(scTags).contains("process:.*surefire.*"));
+        assertEquals(scTags.length, 1);
+        assertTrue(Arrays.asList(scTags).contains("instance:jmx_test_instance"));
         mbs.unregisterMBean(objectName);
     }
 
@@ -362,10 +358,8 @@ public void testServiceCheckCRITICAL() throws Exception {
         assertEquals("non_running_process", scName);
         assertEquals(Status.STATUS_ERROR, scStatus);
         assertEquals("Cannot connect to instance process_regex: .*non_running_process_test.* Cannot find JVM matching regex: .*non_running_process_test.*", scMessage);
-        assertEquals(scTags.length, 3);
-        assertTrue(Arrays.asList(scTags).contains("env:stage"));
-        assertTrue(Arrays.asList(scTags).contains("newTag:test"));
-        assertTrue(Arrays.asList(scTags).contains("process:.*non_running_process_test.*"));
+        assertEquals(scTags.length, 1);
+        assertTrue(Arrays.asList(scTags).contains("instance:jmx_test_instance"));
 
 
         // Test that a CRITICAL service check status is sent on iteration
@@ -388,10 +382,8 @@ public void testServiceCheckCRITICAL() throws Exception {
         assertEquals("non_running_process", scName);
         assertEquals(Status.STATUS_ERROR, scStatus);
         assertEquals("Cannot connect to instance process_regex: .*non_running_process_test.*. Is a JMX Server running at this address?", scMessage);
-        assertEquals(scTags.length, 3);
-        assertTrue(Arrays.asList(scTags).contains("env:stage"));
-        assertTrue(Arrays.asList(scTags).contains("newTag:test"));
-        assertTrue(Arrays.asList(scTags).contains("process:.*non_running_process_test.*"));
+        assertEquals(scTags.length, 1);
+        assertTrue(Arrays.asList(scTags).contains("instance:jmx_test_instance"));
 
         mbs.unregisterMBean(objectName);
     }