increased version in html for CDN refresh; updated API reference for badge.svg; installer attempts to use service with restart argument; enable exim plugin for installation
Costa Tsaousis (ktsaou) committed
Jun 4, 2016 at 20:07 UTC
348f0302fc3764c0bbd11c8cbafa41af3b2dbeed
11 files changed
+140
-21
charts.d/Makefile.am
+1
@@ -11,6 +11,7 @@ dist_charts_SCRIPTS = \
11
cpufreq.chart.sh \
12
crsproxy.chart.sh \
13
example.chart.sh \
14
+ exim.chart.sh \
15
load_average.chart.sh \
16
mem_apps.chart.sh \
17
mysql.chart.sh \
netdata-installer.sh
+6
-2
@@ -607,7 +607,7 @@ if [ "${UID}" -eq 0 ]
607
fi
608
609
stop_all_netdata
610
- run service netdata start && started=1
610
+ run service netdata restart && started=1
611
fi
612
613
if [ ${started} -eq 0 ]
@@ -615,7 +615,11 @@ if [ "${UID}" -eq 0 ]
615
# check if we can use the system service
616
run service netdata stop
617
stop_all_netdata
618
- run service netdata start && started=1
618
+ run service netdata restart && started=1
619
+ if [ ${started} -eq 0 ]
620
+ then
621
+ run service netdata start && started=1
622
+ fi
623
fi
624
fi
625
src/web_client.c
-3
@@ -740,9 +740,6 @@ int web_client_api_v1_badge(struct web_client *w, char *url) {
740
else if(!strcmp(name, "group")) {
741
group = web_client_api_request_v1_data_group(value);
742
}
743
- else if(!strcmp(name, "format")) {
744
- format = web_client_api_request_v1_data_format(value);
745
- }
743
else if(!strcmp(name, "options")) {
744
options |= web_client_api_request_v1_data_options(value);
745
}
web/dashboard.html
+1
-1
@@ -654,4 +654,4 @@ So, to avoid flashing the charts, we destroy and re-create the charts on each up
654
<!-- <script> netdataServer = "http://box:19999"; </script> -->
655
656
<!-- load the dashboard manager - it will do the rest -->
657
- <script type="text/javascript" src="dashboard.js?v38"></script>
657
+ <script type="text/javascript" src="dashboard.js?v39"></script>
web/demo.html
+1
-1
@@ -19,7 +19,7 @@
19
<meta property="og:title" content="netdata - real-time performance monitoring, done right!"/>
20
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
21
22
- <script type="text/javascript" src="dashboard.js?v38"></script>
22
+ <script type="text/javascript" src="dashboard.js?v39"></script>
23
</head>
24
<body>
25
web/demo2.html
+1
-1
@@ -20,7 +20,7 @@
20
<meta property="og:description" content="Stunning real-time dashboards, blazingly fast and extremely interactive. Zero configuration, zero dependencies, zero maintenance." />
21
22
<script>var netdataTheme = 'slate';</script>
23
- <script type="text/javascript" src="dashboard.js?v38"></script>
23
+ <script type="text/javascript" src="dashboard.js?v39"></script>
24
</head>
25
<body>
26
web/demosites.html
+1
-1
@@ -50,7 +50,7 @@
50
and that you have chown it to be owned by netdata:netdata
51
-->
52
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
53
- <script type="text/javascript" src="dashboard.js?v38"></script>
53
+ <script type="text/javascript" src="dashboard.js?v39"></script>
54
55
<script>
56
// --- OPTIONS FOR THE CHARTS --
web/index.html
+9
-9
@@ -427,7 +427,7 @@
427
</script>
428
429
<!-- load the dashboard manager - it will do the rest -->
430
- <script type="text/javascript" src="dashboard.js?v37"></script>
430
+ <script type="text/javascript" src="dashboard.js?v39"></script>
431
</head>
432
433
<body data-spy="scroll" data-target="#sidebar">
@@ -2427,14 +2427,14 @@ function finalizePage() {
2427
offset: $(window).height() / 3 // controls the diff of the <hX> element to the top, to select it
2428
});
2429
2430
- $('#sidebar').on('activate.bs.scrollspy', function (e)
2431
- {
2432
- var el = $(e.target);
2433
- if (el.find('ul').size() == 0)
2434
- {
2435
- var href = el.find('a').attr('href');
2436
- history.pushState(null, document.title, href);
2437
- };
2430
+ $('#sidebar').on('activate.bs.scrollspy', function (e)
2431
+ {
2432
+ var el = $(e.target);
2433
+ if (el.find('ul').size() == 0)
2434
+ {
2435
+ var href = el.find('a').attr('href');
2436
+ history.pushState(null, document.title, href);
2437
+ };
2438
});
2439
2440
document.getElementById('footer').style.display = 'block';
web/netdata-swagger.yaml
+118
-1
@@ -2,7 +2,7 @@ swagger: '2.0'
2
info:
3
title: NetData API
4
description: 'Real time data collection and graphs...'
5
- version: 1.0.0
5
+ version: 1.2.1_master
6
host: netdata.firehol.org
7
schemes:
8
- http
@@ -143,6 +143,123 @@ paths:
143
description: 'No chart with the given id is found.'
144
'500':
145
description: 'Internal server error. This usually means the server is out of memory.'
146
+ /badge.svg:
147
+ get:
148
+ summary: 'Generate a SVG image for a chart (or dimension)'
149
+ description: |
150
+ Successful responses are SVG images
151
+ parameters:
152
+ - name: chart
153
+ in: query
154
+ description: 'The id of the chart as returned by the /charts call.'
155
+ required: true
156
+ type: string
157
+ format: 'as returned by /charts'
158
+ allowEmptyValue: false
159
+ default: system.cpu
160
+ - name: dimension
161
+ in: query
162
+ description: 'zero, one or more dimension ids, as returned by the /chart call.'
163
+ required: false
164
+ type: array
165
+ items:
166
+ type: string
167
+ collectionFormat: pipes
168
+ format: 'as returned by /charts'
169
+ allowEmptyValue: false
170
+ - name: after
171
+ in: query
172
+ description: 'This parameter can either be an absolute timestamp specifying the starting point of the data to be returned, or a relative number of seconds, to the last collected timestamp. Netdata will assume it is a relative number if it is smaller than the duration of the round robin database for this chart. So, if the round robin database is 3600 seconds, any value from -3600 to 3600 will trigger relative arithmetics. Netdata will adapt this parameter to the boundaries of the round robin database.'
173
+ required: true
174
+ type: number
175
+ format: integer
176
+ allowEmptyValue: false
177
+ default: -600
178
+ - name: before
179
+ in: query
180
+ description: 'This parameter can either be an absolute timestamp specifying the ending point of the data to be returned, or a relative number of seconds, to the last collected timestamp. Netdata will assume it is a relative number if it is smaller than the duration of the round robin database for this chart. So, if the round robin database is 3600 seconds, any value from -3600 to 3600 will trigger relative arithmetics. Netdata will adapt this parameter to the boundaries of the round robin database.'
181
+ required: false
182
+ type: number
183
+ format: integer
184
+ default: 0
185
+ - name: points
186
+ in: query
187
+ description: 'The number of points to be returned. If not given, or it is <= 0, or it is bigger than the points stored in the round robin database for this chart for the given duration, all the available collected values for the given duration are returned.'
188
+ required: true
189
+ type: number
190
+ format: integer
191
+ allowEmptyValue: false
192
+ default: 20
193
+ - name: group
194
+ in: query
195
+ description: 'The grouping method. If multiple collected values are to be grouped in order to return fewer points, this parameters defines the method of grouping. Two methods are supported, "max" and "average". "max" is actually calculated on the absolute value collected (so it works for both positive and negative dimesions to return the most extreme value in either direction).'
196
+ required: true
197
+ type: string
198
+ enum: [ 'max', 'average' ]
199
+ default: 'average'
200
+ allowEmptyValue: false
201
+ - name: options
202
+ in: query
203
+ description: 'Options that affect data generation.'
204
+ required: false
205
+ type: array
206
+ items:
207
+ type: string
208
+ enum: [ 'nonzero', 'flip', 'abs', 'absolute', 'absolute-sum', 'null2zero', 'percentage' ]
209
+ collectionFormat: pipes
210
+ default: ['absolute']
211
+ allowEmptyValue: true
212
+ - name: label
213
+ in: query
214
+ description: 'a text to be used as the label'
215
+ required: false
216
+ type: string
217
+ format: 'any text'
218
+ allowEmptyValue: true
219
+ - name: units
220
+ in: query
221
+ description: 'a text to be used as the units'
222
+ required: false
223
+ type: string
224
+ format: 'any text'
225
+ allowEmptyValue: true
226
+ - name: label_color
227
+ in: query
228
+ description: 'a color to be used for the background of the label'
229
+ required: false
230
+ type: string
231
+ format: 'any text'
232
+ allowEmptyValue: true
233
+ - name: value_color
234
+ in: query
235
+ description: 'a color to be used for the background of the label. You can set multiple using a pipe with a condition each, like this: color<value|color>value|color:null The following operators are supported: >, <, >=, <=, =, :null (to check if no value exists).'
236
+ required: false
237
+ type: string
238
+ format: 'any text'
239
+ allowEmptyValue: true
240
+ - name: multiply
241
+ in: query
242
+ description: 'multiply the value with this number for rendering it at the image (integer value required)'
243
+ required: false
244
+ type: number
245
+ format: integer
246
+ allowEmptyValue: true
247
+ - name: divide
248
+ in: query
249
+ description: 'divide the value with this number for rendering it at the image (integer value required)'
250
+ required: false
251
+ type: number
252
+ format: integer
253
+ allowEmptyValue: true
254
+ responses:
255
+ '200':
256
+ description: 'The call was successful. The response should be an SVG image.'
257
+ '400':
258
+ description: 'Bad request - the body will include a message stating what is wrong.'
259
+ '404':
260
+ description: 'No chart with the given id is found.'
261
+ '500':
262
+ description: 'Internal server error. This usually means the server is out of memory.'
263
definitions:
264
chart_summary:
265
type: object
web/registry.html
+1
-1
@@ -133,7 +133,7 @@
133
and that you have chown it to be owned by netdata:netdata
134
-->
135
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
136
- <script type="text/javascript" src="dashboard.js?v38"></script>
136
+ <script type="text/javascript" src="dashboard.js?v39"></script>
137
138
<script>
139
// Set options for TV operation
web/tv.html
+1
-1
@@ -48,7 +48,7 @@
48
and that you have chown it to be owned by netdata:netdata
49
-->
50
<!-- <script type="text/javascript" src="http://my.server:19999/dashboard.js"></script> -->
51
- <script type="text/javascript" src="dashboard.js?v38"></script>
51
+ <script type="text/javascript" src="dashboard.js?v39"></script>
52
53
<script>
54
// Set options for TV operation