first finishing touches

Makefile

@@ -9,6 +9,9 @@ build:
 	(cd fnordmetric-webui && make build)
 	(cd fnordmetric-core && make build)
 
+install:
+	(cd fnordmetric-core && make install)
+
 test:
 	(cd fnordmetric-core && make test)
 

fnordmetric-core/Makefile

@@ -9,6 +9,9 @@ build:
 	(cd ../fnordmetric-webui && make)
 	(cd build/cmake && make)
 
+install: build
+	(cd build/cmake && make install)
+
 devserver: build
 	mkdir -p /tmp/fnordmetric-data
 	DEV_ASSET_PATH=../ ./build/cmake/target/fnordmetric-server --datadir /tmp/fnordmetric-data --verbose

fnordmetric-core/build/cmake/CMakeLists.txt

@@ -160,9 +160,11 @@ endif()
 # fnordmetric
 add_executable(fnordmetric-cli stage/src/fnordmetric/cli.cc)
 target_link_libraries(fnordmetric-cli fnord-static)
+install(TARGETS fnordmetric-cli DESTINATION bin)
 
 add_executable(fnordmetric-server stage/src/fnordmetric/server.cc)
 target_link_libraries(fnordmetric-server fnord-static)
+install(TARGETS fnordmetric-server DESTINATION bin)
 
 # libfnord tests
 add_executable(tests/test-sql stage/src/fnordmetric/sql/sql_test.cc)

fnordmetric-core/build/cmake/Makefile

@@ -7,13 +7,16 @@ all: assets
 	mkdir -p target/tests
 	mkdir -p stage/src
 	test -e stage/src/fnordmetric || ln -s ../../../../src stage/src/fnordmetric || true
-	(cd target && cmake .. && make)
+	(cd target && cmake .. -DCMAKE_BUILD_TYPE=Release && make)
 	rm -f ../fnordmetric
 	rm -f ../libfnordmetric-static.a
 	rm -f ../libfnordmetric.dylib
 	rm -f ../libfnordmetric.so
 	ln -s cmake/target/fnordmetric ../fnordmetric
 
+install:
+	(cd target && cmake .. && make install)
+
 assets:
 	./assets.sh
 
@@ -23,4 +26,4 @@ test: all
 clean:
 	rm -rf target stage
 
-.PHONY: all test clean assets
+.PHONY: all test clean assets install

fnordmetric-doc/TODO

@@ -2,15 +2,13 @@
 [ doc ]
     - frontapge: gif
     - readme for gh
+    - html5 api references
     - frontpage: example query result
     - dashboard api reference
     - FM legt die timestamps der samples _immer_ selbst bei dateneingang fest?
     - pictures in getting started server
-    - make all the command in installation work
     - chart 2d/3d signature doc
     - all the doc links
-    - page: included agents
-    - finish http api 
     - group over doc: GROUP OVER TIMEWINDOW(time_window, step) oder so
 
 [ frontend ]
@@ -25,8 +23,6 @@
 [ release ]
     - functions: round, median, percentile
     - svg: escape series names, labels!
-    - ruby client
-    - javascript client + doc
 
 -----
 
@@ -36,6 +32,12 @@
     - do I need an external database
 
 [ feature q ]
+    - version numbers
+    - deb pkg
+    - homebrew pkg
+    - doc: interactive queries
+    - ruby client + doc
+    - javascript client + doc
     - make query editor split draggable/resizable
     - functions: delta
     - vertical hover line in chartextensions

fnordmetric-doc/documentation/getting_started.md

@@ -82,6 +82,8 @@ minutes using only SQL and HTML/CSS. Includes generic dashboard control elements
 
 [Getting started with the HTML5 API](/documentation/getting_started/fnordmetric-server)
 
+<!--
+
 #### FnordMetric for JavaScript and node.js
 
 The JavaScript client allows you to plug fnordmetric charts into any web
@@ -106,7 +108,7 @@ FnordMetric also includes a number of pre-built agents to collect data from comm
 
   + Docker Agent (fm-docker-agent)
 
-
+-->
 
 Rationale
 ---------

fnordmetric-doc/documentation/installation.md

@@ -5,37 +5,19 @@ FnordMetric is written in C++. You can either install a binary release or compil
 from source. Fnordmetric will install two binaries into your system: `fnordmetric-cli`
 and `fnordmetric-server`.
 
-#### Download FnordMetric
-
-+ [Download FnordMetric v0.0.1 \(latest\) -- OSX 10.8](/downloads/fnordmetric-ui-1.2.9.tar) (.tar, 340k) <br /> MD5: cd4eb89d9a0353840d5f343690e4ff2e
-
-+ [Download FnordMetric v0.0.1 \(latest\) -- linux-generic-x86_46](/downloads/fnordmetric-ui-1.2.9.tar) (.tar, 340k) <br /> MD5: cd4eb89d9a0353840d5f343690e4ff2e
-
-
-#### Install via apt-get
-
-    $ apt-get install fnordmetric
-
-#### Install via homebrew
-
-    $ brew install fnordmetric
-
-#### Install via emerge
-
-    $ emerge fnordmetric
+### Binary Releases
 
+Binary Release will be published 2014-12-01
 
 ### Compile from source
 
 You need cmake and a modern c++ compiler. Optional dependencies are libmysqlclient.
 You can find the complete [source code on Github](http://github.com/paulasmuth/fnordmetric)
-or download the release tarball from this website (recommended):
-
-+ [Download FnordMetric v0.0.1 \(latest\) source](/downloads/fnordmetric-ui-1.2.9.tar) (.tar, 340k) <br /> MD5: cd4eb89d9a0353840d5f343690e4ff2e
 
 To compile fnordmetric
 
-    $ make
+    $ git clone https://github.com/paulasmuth/fnordmetric.git && cd fnordmetric
+    $ make install
 
 To run the tests
 

fnordmetric-doc/web/config.yml

@@ -68,12 +68,12 @@ documentation:
         title: "Sending data via statsd"
         url: "/metridb/statsd_interface"
         file: "metricdb_statsd_interface"
-      -
-        title: "Retention & Downsampling"
-        url: "/query_language/reference"
-      -
-        title: "Included agents"
-        url: "/query_language/reference"
+      #-
+      #  title: "Retention & Downsampling"
+      #  url: "/query_language/reference"
+      #-
+      #  title: "Included agents"
+      #  url: "/query_language/reference"
 
   -
     title: "Building Dashboards"
@@ -90,15 +90,15 @@ documentation:
   -
     title: "Customizing Charts"
     pages:
-      -
-        title: "Axis styles"
-        url: "/query_language/reference"
-      -
-        title: "Legend styles"
-        url: "/query_language/reference"
-      -
-        title: "Point and Line styles"
-        url: "/query_language/reference"
+      #-
+      #  title: "Axis styles"
+      #  url: "/query_language/reference"
+      #-
+      #  title: "Legend styles"
+      #  url: "/query_language/reference"
+      #-
+      #  title: "Point and Line styles"
+      #  url: "/query_language/reference"
       -
         title: "Line Charts"
         url: "/query_language/reference"
@@ -111,12 +111,12 @@ documentation:
       -
         title: "Bar Charts"
         url: "/query_language/reference"
-      -
-        title: "Interactive Charts"
-        url: "/query_language/reference"
-      -
-        title: "Styles / Themes"
-        url: "/query_language/reference"
+      #-
+      #  title: "Interactive Charts"
+      #  url: "/query_language/reference"
+      #-
+      #  title: "Styles / Themes"
+      #  url: "/query_language/reference"
 
   -
     title: "FnordMetric APIs &amp Clients"
@@ -125,12 +125,12 @@ documentation:
         title: "FnordMetric HTTP API"
         url: "/http_api"
         file: "http_api"
-      -
-        title: "FnordMetric for JavaScript"
-        url: "/query_language/reference"
-      -
-        title: "FnordMetric for Ruby (on Rails)"
-        url: "/query_language/reference"
+      #-
+      #  title: "FnordMetric for JavaScript"
+      #  url: "/query_language/reference"
+      #-
+      #  title: "FnordMetric for Ruby (on Rails)"
+      #  url: "/query_language/reference"
 
 
   -

fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js

@@ -92,7 +92,6 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
     var error_box = document.createElement("div");
     error_box.className = "error_box";
     error_box.innerHTML = message;
-    table_container.innerHTML = "";
     chart_container.innerHTML = "";
     chart_container.appendChild(error_box);
   }
@@ -104,6 +103,7 @@ FnordMetric.util.MetricPreviewWidget = function(viewport, query_params) {
 
     var queryurl = "/query?height=400&width=" + (window.innerWidth - 40);
     FnordMetric.util.displayLoader(chart_container);
+    table_container.innerHTML = "";
     FnordMetric.httpPost(queryurl, querystr, function(r) {
       if (r.status == 200) {
         var json = JSON.parse(r.response);