From 9b559cccff624283a540fba1f6294e0dfc1b5388 Mon Sep 17 00:00:00 2001 From: Costa Tsaousis Date: Tue, 27 Dec 2016 19:23:35 +0200 Subject: [PATCH] fixed checks in dashboard.js and added azure and amazon demos on demosites.html --- web/dashboard.js | 10 ++++--- web/demosites.html | 71 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/web/dashboard.js b/web/dashboard.js index 37f25860..c4f3a93e 100644 --- a/web/dashboard.js +++ b/web/dashboard.js @@ -3855,7 +3855,7 @@ var self = $(state.element); var type = self.data('sparkline-type') || 'line'; var lineColor = self.data('sparkline-linecolor') || state.chartColors()[0]; - var fillColor = self.data('sparkline-fillcolor') || (state.chart.chart_type === 'line')?NETDATA.themes.current.background:NETDATA.colorLuminance(lineColor, NETDATA.chartDefaults.fill_luminance); + var fillColor = self.data('sparkline-fillcolor') || ((state.chart.chart_type === 'line')?NETDATA.themes.current.background:NETDATA.colorLuminance(lineColor, NETDATA.chartDefaults.fill_luminance)); var chartRangeMin = self.data('sparkline-chartrangemin') || undefined; var chartRangeMax = self.data('sparkline-chartrangemax') || undefined; var composite = self.data('sparkline-composite') || undefined; @@ -3903,6 +3903,8 @@ if(minSpotColor === 'disable') minSpotColor=''; if(maxSpotColor === 'disable') maxSpotColor=''; + // state.log('sparkline type ' + type + ', lineColor: ' + lineColor + ', fillColor: ' + fillColor); + state.sparkline_options = { type: type, lineColor: lineColor, @@ -4211,9 +4213,9 @@ strokeBorderColor: self.data('dygraph-strokebordercolor') || NETDATA.themes.current.background, strokeBorderWidth: self.data('dygraph-strokeborderwidth') || (chart_type === 'stacked')?0.0:0.0, - fillGraph: self.data('dygraph-fillgraph') || (chart_type === 'area' || chart_type === 'stacked')?true:false, - fillAlpha: self.data('dygraph-fillalpha') || (chart_type === 'stacked')?NETDATA.options.current.color_fill_opacity_stacked:NETDATA.options.current.color_fill_opacity_area, - stackedGraph: self.data('dygraph-stackedgraph') || (chart_type === 'stacked')?true:false, + fillGraph: self.data('dygraph-fillgraph') || ((chart_type === 'area' || chart_type === 'stacked')?true:false), + fillAlpha: self.data('dygraph-fillalpha') || ((chart_type === 'stacked')?NETDATA.options.current.color_fill_opacity_stacked:NETDATA.options.current.color_fill_opacity_area), + stackedGraph: self.data('dygraph-stackedgraph') || ((chart_type === 'stacked')?true:false), stackedGraphNaNFill: self.data('dygraph-stackedgraphnanfill') || 'none', drawAxis: self.data('dygraph-drawaxis') || true, diff --git a/web/demosites.html b/web/demosites.html index e212e4cd..2cb8bfcb 100644 --- a/web/demosites.html +++ b/web/demosites.html @@ -539,6 +539,12 @@ p { display: inline-block; } + .mygauge-combo25 { + display: inline-block; + min-width: 200px; + max-width: 25%; + } + .mygauge { position: relative; display: block; @@ -878,16 +884,16 @@ p {
- Charts are coming from 8 servers, in parallel. + Charts are coming from all servers, in parallel.
- The servers are not aware of this multi-server dashboard. + The servers are not aware of this multi-server dashboard.
- Each server is not aware of the other servers. + Each server is not aware of the other servers.
But on this dashboard they are one! (hover on the chart below)
-
+
EU - London connected clients @@ -910,13 +916,68 @@ p { >
+ +

Want more demos?

+ +
+
+ on Amazon EC2 +
+
+
+ connected clients +
+
+
+
+
+ Enter Amazon! +
+
+
+ on Azure +
+
+
+ connected clients +
+
+
+
+
+ Enter Azure! +

Who uses netdata?

- Figures come from users using the netdata public global registry.
Counting since May 16th 2016. Actual figures might be a lot higher.
 + Figures come from users using the netdata public global registry.
Counting since May 16th 2016. Actual figures may be a lot higher.
-- 2.39.2