don't include server id in graphite metrics

fixes #SERVER-140
Graylog2 · Oct 16, 2012 · 7b481d7 · 7b481d7
1 parent 53b188d
commit 7b481d7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/main/java/org/graylog2/GraphiteFormatter.java b/src/main/java/org/graylog2/GraphiteFormatter.java
@@ -31,12 +31,10 @@
 public class GraphiteFormatter {
 
     private MessageCounter counter;
-    String serverId;
     String prefix;
 
-    public GraphiteFormatter(MessageCounter counter, String serverId, String prefix) {
+    public GraphiteFormatter(MessageCounter counter, String prefix) {
         this.counter = counter;
-        this.serverId = serverId;
         this.prefix = prefix;
     }
 
@@ -65,7 +63,7 @@ public List<String> getAllMetrics() {
     }
 
     private String prefix() {
-        return prefix + "." + serverId + "." + "messagecounts" + ".";
+        return prefix + "." + "messagecounts" + ".";
     }
 
 }
diff --git a/src/main/java/org/graylog2/periodical/GraphiteWriterThread.java b/src/main/java/org/graylog2/periodical/GraphiteWriterThread.java
@@ -70,7 +70,6 @@ public void run() {
         try {
             GraphiteFormatter f = new GraphiteFormatter(
                     counter,
-                    graylogServer.getServerId(),
                     graylogServer.getConfiguration().getGraphitePrefix()
             );