From a3d78ef61a277b0b62dc93daf84756dfa7625d3d Mon Sep 17 00:00:00 2001
From: Ivan Topolnjak <ivantopo@gmail.com>
Date: Thu, 25 May 2017 16:52:52 +0200
Subject: trying to flatten out the structure and eliminate the notion of
 entitites

---
 kamon-core/src/main/resources/logback.xml    | 12 ++++++++++++
 kamon-core/src/main/resources/reference.conf | 28 +++++++++++++++-------------
 2 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 kamon-core/src/main/resources/logback.xml

(limited to 'kamon-core/src/main/resources')

diff --git a/kamon-core/src/main/resources/logback.xml b/kamon-core/src/main/resources/logback.xml
new file mode 100644
index 00000000..af71060f
--- /dev/null
+++ b/kamon-core/src/main/resources/logback.xml
@@ -0,0 +1,12 @@
+<configuration>
+    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <root level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/kamon-core/src/main/resources/reference.conf b/kamon-core/src/main/resources/reference.conf
index b514b1b7..f4d180ca 100644
--- a/kamon-core/src/main/resources/reference.conf
+++ b/kamon-core/src/main/resources/reference.conf
@@ -1,4 +1,10 @@
 kamon {
+  environment {
+    application = ""
+    host = ""
+    instance = ""
+  }
+
   metric {
     tick-interval = 60 seconds
 
@@ -11,7 +17,7 @@ kamon {
       # NOTE: Using entity filters is a commodity for modules that might potentially track thousands of unnecessary
       #       entities, but not all modules are required to use filters, check the your module's documentation to
       #       determine whether setting up filters make sense or not.
-      accept-unmatched-categories = true
+      accept-unmatched = true
 
     }
 
@@ -35,38 +41,34 @@ kamon {
       #
       default-settings {
         histogram {
-          lowest-discernible-value = 0
+          lowest-discernible-value = 1
           highest-trackable-value = 3600000000000
           significant-value-digits = 2
         }
 
         min-max-counter {
-          lowest-discernible-value = 0
+          lowest-discernible-value = 1
           highest-trackable-value = 3600000000000
           significant-value-digits = 2
           sample-interval = 200 millis
         }
       }
 
-      # Custom settings for instruments of a given category. The settings provided in this section override the default
-      # and manually provided settings when creating instruments. All settings are optional in this section and default
+      # Custom settings for instruments of a given metric. The settings provided in this section override the default
+      # and manually provided settings when creating metrics. All settings are optional in this section and default
       # values from the `kamon.metric.instrument-factory.default-settings` will be used in case of any setting being
       # missing.
       #
       # Example:
-      # If you wish to change the highest trackable value setting of the `elapsed-time` instrument in the `span`
-      # category, you should include the following configuration in your application.conf file:
+      # If you wish to change the highest trackable value setting of the `span.elapsed-time` metric, you should include
+      # the following configuration in your application.conf file:
       #
-      #   kamon.metric.instrument-factory.custom-settings.span {
-      #     elapsed-time {
+      #   kamon.metric.instrument-factory.custom-settings {
+      #     "span.elapsed-time" {
       #       highest-trackable-value = 5000
       #     }
       #   }
       #
-      # After including that configuration, every time a new histogram called `elapsed-time` for a entity with category
-      # `span`, the highest-trackable-value will be 5000, but lowest-discernible-value and significant-value-digits will
-      # remain with default values.
-      #
       custom-settings {
 
       }
-- 
cgit v1.2.3