fixed checks in dashboard.js and added azure and amazon demos on demosites.html
Costa Tsaousis committed
Dec 27, 2016 at 19:23 UTC
9b559cccff624283a540fba1f6294e0dfc1b5388
2 files changed
+72
-9
web/dashboard.js
+6
-4
@@ -3855,7 +3855,7 @@
3855
var self = $(state.element);
3856
var type = self.data('sparkline-type') || 'line';
3857
var lineColor = self.data('sparkline-linecolor') || state.chartColors()[0];
3858
- var fillColor = self.data('sparkline-fillcolor') || (state.chart.chart_type === 'line')?NETDATA.themes.current.background:NETDATA.colorLuminance(lineColor, NETDATA.chartDefaults.fill_luminance);
3858
+ var fillColor = self.data('sparkline-fillcolor') || ((state.chart.chart_type === 'line')?NETDATA.themes.current.background:NETDATA.colorLuminance(lineColor, NETDATA.chartDefaults.fill_luminance));
3859
var chartRangeMin = self.data('sparkline-chartrangemin') || undefined;
3860
var chartRangeMax = self.data('sparkline-chartrangemax') || undefined;
3861
var composite = self.data('sparkline-composite') || undefined;
@@ -3903,6 +3903,8 @@
3903
if(minSpotColor === 'disable') minSpotColor='';
3904
if(maxSpotColor === 'disable') maxSpotColor='';
3905
3906
+ // state.log('sparkline type ' + type + ', lineColor: ' + lineColor + ', fillColor: ' + fillColor);
3907
+
3908
state.sparkline_options = {
3909
type: type,
3910
lineColor: lineColor,
@@ -4211,9 +4213,9 @@
4213
strokeBorderColor: self.data('dygraph-strokebordercolor') || NETDATA.themes.current.background,
4214
strokeBorderWidth: self.data('dygraph-strokeborderwidth') || (chart_type === 'stacked')?0.0:0.0,
4215
4214
- fillGraph: self.data('dygraph-fillgraph') || (chart_type === 'area' || chart_type === 'stacked')?true:false,
4215
- fillAlpha: self.data('dygraph-fillalpha') || (chart_type === 'stacked')?NETDATA.options.current.color_fill_opacity_stacked:NETDATA.options.current.color_fill_opacity_area,
4216
- stackedGraph: self.data('dygraph-stackedgraph') || (chart_type === 'stacked')?true:false,
4216
+ fillGraph: self.data('dygraph-fillgraph') || ((chart_type === 'area' || chart_type === 'stacked')?true:false),
4217
+ fillAlpha: self.data('dygraph-fillalpha') || ((chart_type === 'stacked')?NETDATA.options.current.color_fill_opacity_stacked:NETDATA.options.current.color_fill_opacity_area),
4218
+ stackedGraph: self.data('dygraph-stackedgraph') || ((chart_type === 'stacked')?true:false),
4219
stackedGraphNaNFill: self.data('dygraph-stackedgraphnanfill') || 'none',
4220
4221
drawAxis: self.data('dygraph-drawaxis') || true,
web/demosites.html
+66
-5
@@ -539,6 +539,12 @@ p {
539
display: inline-block;
540
}
541
542
+ .mygauge-combo25 {
543
+ display: inline-block;
544
+ min-width: 200px;
545
+ max-width: 25%;
546
+ }
547
+
548
.mygauge {
549
position: relative;
550
display: block;
@@ -878,16 +884,16 @@ p {
884
</div>
885
</div>
886
<div class="container" style="padding-top: 40px; text-align: center;">
881
- Charts are coming from 8 servers, in parallel.
887
+ Charts are coming from all servers, <b>in parallel</b>.
888
<br/>
883
- The servers are not aware of this multi-server dashboard.
889
+ The servers are <b>not aware</b> of this multi-server dashboard.
890
<br/>
885
- Each server is not aware of the other servers.
891
+ Each server is <b>not aware</b> of the other servers.
892
<br/>
893
But on this dashboard <b>they are one</b>! (hover on the chart below)
894
</div>
895
890
- <div class="container" style="padding-top: 40px; text-align: center;">
896
+ <div class="container" style="padding-top: 40px; padding-bottom: 40px; text-align: center;">
897
<div class="mysparkline">
898
<div class="mysparkline-overchart-label">
899
<b>EU - London</b> connected clients
@@ -910,13 +916,68 @@ p {
916
></div>
917
</div>
918
</div>
919
+
920
+ <h3>Want more demos?</h3>
921
+
922
+ <div class="mygauge-combo25" style="padding-top: 40px; text-align: center;">
923
+ <div style="padding-bottom: 20px;">
924
+ <b>on Amazon EC2</b>
925
+ </div>
926
+ <div class="mysparkline">
927
+ <div class="mysparkline-overchart-label">
928
+ connected clients
929
+ </div>
930
+ <div class="mysparkline-overchart-value" id="aws-fra-nginx_local.connections.netdata" >
931
+ </div>
932
+ <div data-netdata="nginx_local.connections"
933
+ data-dimensions="active"
934
+ data-host="//aws-fra.my-netdata.io"
935
+ data-decimal-digits="0"
936
+ data-chart-library="dygraph"
937
+ data-dygraph-theme="sparkline"
938
+ data-dygraph-type="area"
939
+ data-width="100%"
940
+ data-height="100%"
941
+ data-after="-300"
942
+ data-colors="#004B91"
943
+ data-show-value-of-active-at="aws-fra-nginx_local.connections.netdata"
944
+ ></div>
945
+ </div>
946
+ <a class="btn btn-alt mygauge-legend-button" href=//aws-fra.my-netdata.io/default.html data-ga-category="Outbound links" data-ga-action="Nav click" data-ga-label=DemoAwsFra><strong>Enter Amazon!</strong></a>
947
+ </div>
948
+ <div class="mygauge-combo25" style="padding-top: 40px; text-align: center;">
949
+ <div style="padding-bottom: 20px;">
950
+ <b>on Azure</b>
951
+ </div>
952
+ <div class="mysparkline">
953
+ <div class="mysparkline-overchart-label">
954
+ connected clients
955
+ </div>
956
+ <div class="mysparkline-overchart-value" id="azure-west-eu-nginx_local.connections.netdata" >
957
+ </div>
958
+ <div data-netdata="nginx_local.connections"
959
+ data-dimensions="active"
960
+ data-host="//azure-west-eu.my-netdata.io"
961
+ data-decimal-digits="0"
962
+ data-chart-library="dygraph"
963
+ data-dygraph-theme="sparkline"
964
+ data-dygraph-type="area"
965
+ data-width="100%"
966
+ data-height="100%"
967
+ data-after="-300"
968
+ data-colors="#007FFF"
969
+ data-show-value-of-active-at="azure-west-eu-nginx_local.connections.netdata"
970
+ ></div>
971
+ </div>
972
+ <a class="btn btn-alt mygauge-legend-button" href=//azure-west-eu.my-netdata.io/default.html data-ga-category="Outbound links" data-ga-action="Nav click" data-ga-label=DemoAzureWestEu><strong>Enter Azure!</strong></a>
973
+ </div>
974
</div>
975
</div>
976
977
<div class=site-section><h2>Who uses netdata?</h2>
978
<div class="content">
979
<div class="container" style="text-align: center;">
919
- <small>Figures come from users using the <a href="https://github.com/firehol/netdata/wiki/mynetdata-menu-item" target="_blank" data-ga-category="Outbound links" data-ga-action="Nav click" data-ga-label=GlobalRegistry>netdata public global registry</a>.<br/>Counting since May 16th 2016. Actual figures might be a lot higher.<br/></small>
980
+ <small>Figures come from users using the <a href="https://github.com/firehol/netdata/wiki/mynetdata-menu-item" target="_blank" data-ga-category="Outbound links" data-ga-action="Nav click" data-ga-label=GlobalRegistry>netdata public global registry</a>.<br/>Counting since May 16th 2016. Actual figures may be a lot higher.<br/></small>
981
<div class="container" style="padding-top: 40px; text-align: center; width: 30%; min-width: 230px; display: inline-block;">
982
<div class="mysparkline">
983
<div class="mysparkline-overchart-label">