Commit b92090a7 authored by Laura Schlimmer's avatar Laura Schlimmer
Browse files

Merge branch 'master' of github.com:paulasmuth/fnordmetric-dev

Conflicts:
	fnordmetric-webui/fnordmetric-webui-metricpreviewwidget.js
	fnordmetric-webui/fnordmetric-webui-util.js
parents 9ecada26 46cd4f4d
Loading
Loading
Loading
Loading
+22 −17
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ enables you to build beautiful real-time analytics dashboards within minutes.

Documentation: [fnordmetric.io](http://fnordmetric.io/documentation/)

[ ![Screenshot](https://github.com/paulasmuth/fnordmetric/raw/v1.0-alpha/doc/preview3.png) ](http://github.com/paulasmuth/fnordmetric)
Demo Video: http://fnordmetric.io/fnordmetric-server.mp4

[ ![Screenshot](https://raw.githubusercontent.com/paulasmuth/fnordmetric-dev/master/fnordmetric-doc/web/assets/img/fnordmetric_server_screen1.png) ](http://github.com/paulasmuth/fnordmetric)


#### FnordMetric ChartSQL
@@ -31,6 +33,7 @@ a wire compatible StatsD API.
FnordMetric Server can store the collected timeseries data on local disk or in
external storage (HBase).


Documentation
-------------

@@ -42,6 +45,7 @@ Contributions

#### Individial Contributors to FnordMetric

+ Laura Schlimmer (http://github.com/lauraschlimmer)
+ Christian Parpart (http://github.com/trapni)
+ Simon Menke (http://github.com/fd),
+ Bruno Michel (http://github.com/nono),
@@ -59,6 +63,7 @@ Contributions
+ Pieter Noordhuis (http://github.com/pietern),
+ Tadas Ščerbinskas (http://github.com/tadassce),
+ Sebastian Korfmann (http://github.com/skorfmann)
+ Paul Asmuth (http://github.com/paulasmuth)

To contribute, please fork this repository, make your changes and run the 
specs, commit them to your github repository and send me a pull request.
+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ Metric::Metric(
    max_generation_(0),
    live_table_max_size_(kLiveTableMaxSize),
    live_table_idle_time_micros_(kLiveTableIdleTimeMicros),
    last_insert_(0) {}
    last_insert_(fnord::util::WallClock::unixMicros()) {} // FIXPAUL

Metric::Metric(
    const std::string& key,
@@ -43,7 +43,7 @@ Metric::Metric(
    file_repo_(file_repo),
    live_table_max_size_(kLiveTableMaxSize),
    live_table_idle_time_micros_(kLiveTableIdleTimeMicros),
    last_insert_(0) {
    last_insert_(fnord::util::WallClock::unixMicros()) { // FIXPAUL
  TableRef* head_table = nullptr;
  std::vector<uint64_t> generations;

+4 −3
Original line number Diff line number Diff line
@@ -132,11 +132,12 @@ void QueryService::renderJSON(
        const auto& row = result_list->getRow(j);

        target->beginArray();
        for (const auto& col : row) {
          target->addString(col);
          if (col != row.back()) {
        for (int i = 0; i < row.size(); ++i) {
          if (i > 0) {
            target->addComma();
          }

          target->addString(row[i]);
        }
        target->endArray();

+12 −17
Original line number Diff line number Diff line

[ 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
    - chart 2d/3d signature doc
    - all the doc links
    - group over doc: GROUP OVER TIMEWINDOW(time_window, step) oder so

[ frontend ]
    - clean up sql result view
    - syntax highlighting
    - embed popup
    - hover flyoouts for button bar in sql editor "Refresh, Change View and use CTRL+enter"
    - better error message style
    - compare with yesterday in metric preview widget
    - metric preview widget: auto refresh (on/off)

[ release ]
    - functions: round, median, percentile
    - svg: escape series names, labels!
    - median
    - fix mean

-----

@@ -30,12 +16,18 @@
    - how do i set the line color
    - can i use fnordmetric with external data
    - do I need an external database
    - FM legt die timestamps der samples _immer_ selbst bei dateneingang fest?

[ feature q ]
    - compare with yesterday in metric preview widget
    - refresh btn in metric preview widget
    - round fn
    - percentiles
    - metric preview widget: auto refresh (on/off)
    - version numbers
    - deb pkg
    - homebrew pkg
    - doc: interactive queries
    - doc: interactive charts
    - ruby client + doc
    - javascript client + doc
    - make query editor split draggable/resizable
@@ -98,10 +90,13 @@
    - report with markdown + chartsql

[ bug q ]
    - svg: escape series names, labels!
    - multiple unnamed select/series should not be merged
    - bug: NAN is not a valid value in SVG
    - SELECT count(*) AS row_count FROM `/osx/load_avg_5m`; --- does not return col name
    - bug: line chart with only negative values
    - bug: 2d area chart with explicit y domain, min > 0
    - proper last insert on restart

[ refactor q ]
    - refactor nextRow(SValue* row, size_t len) -> nextRow(RowType) (std::vector<SValue>)
+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ general syntax of the DRAW statement is:
    DRAW <charttype> [ WITH ] <options>;

All SELECT statements that follow a DRAW statement are interpreted as chart data.
The currently implemented charttypes are `AREACHART`, `BARCHART`, `HEATMAP`, 
`HISTOGRAM`, `LINECHART` and `POINTCHART`;
The currently implemented charttypes are `AREACHART`, `BARCHART`, `LINECHART`
and `POINTCHART`;

For example, a simple draw statement to draw a line chart looks like this:

Loading