@cryptotaxi247 / netdata-1 / commits / f79b16817

when system.io is not available, use system.pgpgio

Costa Tsaousis (ktsaou) committed Oct 26, 2017 at 22:55 UTC f79b168179672b6b20a51339e731ea39f6e26550
1 file changed +111 -88
web/index.html
+111 -88
@@ -1316,117 +1316,140 @@
1316
1317 if(typeof charts['system.swap'] !== 'undefined')
1318 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.swap"'
1319 - + ' data-dimensions="used"'
1320 - + ' data-append-options="percentage"'
1321 - + ' data-chart-library="easypiechart"'
1322 - + ' data-title="Used Swap"'
1323 - + ' data-units="%"'
1324 - + ' data-easypiechart-max-value="100"'
1325 - + ' data-width="9%"'
1326 - + ' data-before="0"'
1327 - + ' data-after="-' + duration.toString() + '"'
1328 - + ' data-points="' + duration.toString() + '"'
1329 - + ' data-colors="#DD4400"'
1330 - + ' role="application"></div>';
1319 + + ' data-dimensions="used"'
1320 + + ' data-append-options="percentage"'
1321 + + ' data-chart-library="easypiechart"'
1322 + + ' data-title="Used Swap"'
1323 + + ' data-units="%"'
1324 + + ' data-easypiechart-max-value="100"'
1325 + + ' data-width="9%"'
1326 + + ' data-before="0"'
1327 + + ' data-after="-' + duration.toString() + '"'
1328 + + ' data-points="' + duration.toString() + '"'
1329 + + ' data-colors="#DD4400"'
1330 + + ' role="application"></div>';
1331
1332 if(typeof charts['system.io'] !== 'undefined') {
1333 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.io"'
1334 - + ' data-dimensions="in"'
1335 - + ' data-chart-library="easypiechart"'
1336 - + ' data-title="Disk Read"'
1337 - + ' data-width="11%"'
1338 - + ' data-before="0"'
1339 - + ' data-after="-' + duration.toString() + '"'
1340 - + ' data-points="' + duration.toString() + '"'
1341 - + ' data-common-units="system.io.mainhead"'
1342 - + ' role="application"></div>';
1334 + + ' data-dimensions="in"'
1335 + + ' data-chart-library="easypiechart"'
1336 + + ' data-title="Disk Read"'
1337 + + ' data-width="11%"'
1338 + + ' data-before="0"'
1339 + + ' data-after="-' + duration.toString() + '"'
1340 + + ' data-points="' + duration.toString() + '"'
1341 + + ' data-common-units="system.io.mainhead"'
1342 + + ' role="application"></div>';
1343
1344 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.io"'
1345 - + ' data-dimensions="out"'
1346 - + ' data-chart-library="easypiechart"'
1347 - + ' data-title="Disk Write"'
1348 - + ' data-width="11%"'
1349 - + ' data-before="0"'
1350 - + ' data-after="-' + duration.toString() + '"'
1351 - + ' data-points="' + duration.toString() + '"'
1352 - + ' data-common-units="system.io.mainhead"'
1353 - + ' role="application"></div>';
1345 + + ' data-dimensions="out"'
1346 + + ' data-chart-library="easypiechart"'
1347 + + ' data-title="Disk Write"'
1348 + + ' data-width="11%"'
1349 + + ' data-before="0"'
1350 + + ' data-after="-' + duration.toString() + '"'
1351 + + ' data-points="' + duration.toString() + '"'
1352 + + ' data-common-units="system.io.mainhead"'
1353 + + ' role="application"></div>';
1354 + }
1355 + else if(typeof charts['system.pgpgio'] !== 'undefined') {
1356 + head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.pgpgio"'
1357 + + ' data-dimensions="in"'
1358 + + ' data-chart-library="easypiechart"'
1359 + + ' data-title="Disk Read"'
1360 + + ' data-width="11%"'
1361 + + ' data-before="0"'
1362 + + ' data-after="-' + duration.toString() + '"'
1363 + + ' data-points="' + duration.toString() + '"'
1364 + + ' data-common-units="system.pgpgio.mainhead"'
1365 + + ' role="application"></div>';
1366 +
1367 + head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.pgpgio"'
1368 + + ' data-dimensions="out"'
1369 + + ' data-chart-library="easypiechart"'
1370 + + ' data-title="Disk Write"'
1371 + + ' data-width="11%"'
1372 + + ' data-before="0"'
1373 + + ' data-after="-' + duration.toString() + '"'
1374 + + ' data-points="' + duration.toString() + '"'
1375 + + ' data-common-units="system.pgpgio.mainhead"'
1376 + + ' role="application"></div>';
1377 }
1378
1379 if(typeof charts['system.cpu'] !== 'undefined')
1380 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.cpu"'
1358 - + ' data-chart-library="gauge"'
1359 - + ' data-title="CPU"'
1360 - + ' data-units="%"'
1361 - + ' data-gauge-max-value="100"'
1362 - + ' data-width="20%"'
1363 - + ' data-after="-' + duration.toString() + '"'
1364 - + ' data-points="' + duration.toString() + '"'
1365 - + ' data-colors="' + NETDATA.colors[12] + '"'
1366 - + ' role="application"></div>';
1381 + + ' data-chart-library="gauge"'
1382 + + ' data-title="CPU"'
1383 + + ' data-units="%"'
1384 + + ' data-gauge-max-value="100"'
1385 + + ' data-width="20%"'
1386 + + ' data-after="-' + duration.toString() + '"'
1387 + + ' data-points="' + duration.toString() + '"'
1388 + + ' data-colors="' + NETDATA.colors[12] + '"'
1389 + + ' role="application"></div>';
1390
1391 if(typeof charts['system.ipv4'] !== 'undefined') {
1392 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.ipv4"'
1370 - + ' data-dimensions="received"'
1371 - + ' data-chart-library="easypiechart"'
1372 - + ' data-title="IPv4 Inbound"'
1373 - + ' data-width="11%"'
1374 - + ' data-before="0"'
1375 - + ' data-after="-' + duration.toString() + '"'
1376 - + ' data-points="' + duration.toString() + '"'
1377 - + ' data-common-units="system.ipv4.mainhead"'
1378 - + ' role="application"></div>';
1393 + + ' data-dimensions="received"'
1394 + + ' data-chart-library="easypiechart"'
1395 + + ' data-title="IPv4 Inbound"'
1396 + + ' data-width="11%"'
1397 + + ' data-before="0"'
1398 + + ' data-after="-' + duration.toString() + '"'
1399 + + ' data-points="' + duration.toString() + '"'
1400 + + ' data-common-units="system.ipv4.mainhead"'
1401 + + ' role="application"></div>';
1402
1403 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.ipv4"'
1381 - + ' data-dimensions="sent"'
1382 - + ' data-chart-library="easypiechart"'
1383 - + ' data-title="IPv4 Outbound"'
1384 - + ' data-width="11%"'
1385 - + ' data-before="0"'
1386 - + ' data-after="-' + duration.toString() + '"'
1387 - + ' data-points="' + duration.toString() + '"'
1388 - + ' data-common-units="system.ipv4.mainhead"'
1389 - + ' role="application"></div>';
1404 + + ' data-dimensions="sent"'
1405 + + ' data-chart-library="easypiechart"'
1406 + + ' data-title="IPv4 Outbound"'
1407 + + ' data-width="11%"'
1408 + + ' data-before="0"'
1409 + + ' data-after="-' + duration.toString() + '"'
1410 + + ' data-points="' + duration.toString() + '"'
1411 + + ' data-common-units="system.ipv4.mainhead"'
1412 + + ' role="application"></div>';
1413 }
1414 else if(typeof charts['system.ipv6'] !== 'undefined') {
1415 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.ipv6"'
1393 - + ' data-dimensions="received"'
1394 - + ' data-chart-library="easypiechart"'
1395 - + ' data-title="IPv6 Inbound"'
1396 - + ' data-units="kbps"'
1397 - + ' data-width="11%"'
1398 - + ' data-before="0"'
1399 - + ' data-after="-' + duration.toString() + '"'
1400 - + ' data-points="' + duration.toString() + '"'
1401 - + ' data-common-units="system.ipv6.mainhead"'
1402 - + ' role="application"></div>';
1416 + + ' data-dimensions="received"'
1417 + + ' data-chart-library="easypiechart"'
1418 + + ' data-title="IPv6 Inbound"'
1419 + + ' data-units="kbps"'
1420 + + ' data-width="11%"'
1421 + + ' data-before="0"'
1422 + + ' data-after="-' + duration.toString() + '"'
1423 + + ' data-points="' + duration.toString() + '"'
1424 + + ' data-common-units="system.ipv6.mainhead"'
1425 + + ' role="application"></div>';
1426
1427 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.ipv6"'
1405 - + ' data-dimensions="sent"'
1406 - + ' data-chart-library="easypiechart"'
1407 - + ' data-title="IPv6 Outbound"'
1408 - + ' data-units="kbps"'
1409 - + ' data-width="11%"'
1410 - + ' data-before="0"'
1411 - + ' data-after="-' + duration.toString() + '"'
1412 - + ' data-points="' + duration.toString() + '"'
1413 - + ' data-common-units="system.ipv6.mainhead"'
1414 - + ' role="application"></div>';
1428 + + ' data-dimensions="sent"'
1429 + + ' data-chart-library="easypiechart"'
1430 + + ' data-title="IPv6 Outbound"'
1431 + + ' data-units="kbps"'
1432 + + ' data-width="11%"'
1433 + + ' data-before="0"'
1434 + + ' data-after="-' + duration.toString() + '"'
1435 + + ' data-points="' + duration.toString() + '"'
1436 + + ' data-common-units="system.ipv6.mainhead"'
1437 + + ' role="application"></div>';
1438 }
1439
1440 if(typeof charts['system.ram'] !== 'undefined')
1441 head += '<div class="netdata-container" style="margin-right: 10px;" data-netdata="system.ram"'
1419 - + ' data-dimensions="used|buffers|active|wired"' // active and wired are FreeBSD stats
1420 - + ' data-append-options="percentage"'
1421 - + ' data-chart-library="easypiechart"'
1422 - + ' data-title="Used RAM"'
1423 - + ' data-units="%"'
1424 - + ' data-easypiechart-max-value="100"'
1425 - + ' data-width="9%"'
1426 - + ' data-after="-' + duration.toString() + '"'
1427 - + ' data-points="' + duration.toString() + '"'
1428 - + ' data-colors="' + NETDATA.colors[7] + '"'
1429 - + ' role="application"></div>';
1442 + + ' data-dimensions="used|buffers|active|wired"' // active and wired are FreeBSD stats
1443 + + ' data-append-options="percentage"'
1444 + + ' data-chart-library="easypiechart"'
1445 + + ' data-title="Used RAM"'
1446 + + ' data-units="%"'
1447 + + ' data-easypiechart-max-value="100"'
1448 + + ' data-width="9%"'
1449 + + ' data-after="-' + duration.toString() + '"'
1450 + + ' data-points="' + duration.toString() + '"'
1451 + + ' data-colors="' + NETDATA.colors[7] + '"'
1452 + + ' role="application"></div>';
1453
1454 return head;
1455 }