Merge branch 'master' of github.com:kamon-io/Kamon

6 files changed, 49 insertions, 13 deletions

diff --git a/site/src/jekyll/_includes/newrelic.md b/site/src/jekyll/_includes/newrelic.md
index 47c56678..2bbf423b 100644
--- a/site/src/jekyll/_includes/newrelic.md
+++ b/site/src/jekyll/_includes/newrelic.md
@@ -1 +1,2 @@
-Some `markdown`.
+#### jlajfkalflsafja
+==============
diff --git a/site/src/jekyll/about/index.md b/site/src/jekyll/about/index.md
new file mode 100644
index 00000000..893cfccb
--- /dev/null
+++ b/site/src/jekyll/about/index.md
@@ -0,0 +1,7 @@
+---
+title: About Me
+layout: default
+---
+
+About
+===
diff --git a/site/src/jekyll/assets/css/kamon.css b/site/src/jekyll/assets/css/kamon.css
index 8b82e90a..7b98af98 100644
--- a/site/src/jekyll/assets/css/kamon.css
+++ b/site/src/jekyll/assets/css/kamon.css
@@ -43,3 +43,5 @@ body {
 .jumbotron {
   background-color: #BDBDBD;
 }
+
+img[alt=newrelic] { width: 100%; }
diff --git a/site/src/jekyll/assets/img/newrelicdifu2.png b/site/src/jekyll/assets/img/newrelicdifu2.png
new file mode 100644
index 00000000..82bcc87d
--- /dev/null
+++ b/site/src/jekyll/assets/img/newrelicdifu2.png
diff --git a/site/src/jekyll/newrelic/index.html b/site/src/jekyll/newrelic/index.html
deleted file mode 100644
index df791f66..00000000
--- a/site/src/jekyll/newrelic/index.html
+++ /dev/null
@@ -1,12 +0,0 @@
----
-layout: default
-title: Kamon - NewRelic Integration
----
-
-{% include newrelic.md %}
-
-<div class="newrelic">
-  {{ content }}
-</div>
-
-
diff --git a/site/src/jekyll/newrelic/index.md b/site/src/jekyll/newrelic/index.md
new file mode 100644
index 00000000..d9957b48
--- /dev/null
+++ b/site/src/jekyll/newrelic/index.md
@@ -0,0 +1,38 @@
+---
+title: About Me
+layout: default
+---
+
+NewRelic Module
+===
+A simple module to report some application metrics like External Services, Errors and Apdex. 
+
+## Usage
+
+### SBT settings 
+
+Add the following sbt dependencies to your project settings:
+
+```scala
+libraryDependencies += "org.kamon" 				 %  "kamon-newrelic" % "0.1.0"
+libraryDependencies += "com.newrelic.agent.java" %  "newrelic-api"   % "3.1.0"
+```
+### Example Configuration
+
+```scala
+-javaagent:/path-to-newrelic-agent.jar, -Dnewrelic.environment=production, -Dnewrelic.config.file=/path-to-newrelic.yml
+```
+
+### Screenshot
+
+![newrelic](/assets/img/newrelicdifu2.png "Screenshot NewRelic")
+
+
+## Limitations
+* The first implementation only supports a subset of NewRelic metrics
+
+## Licensing
+
+NewRelic has [its own, separate licensing](http://newrelic.com/terms).
+
+