Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion app/server/linux_json_api.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ CAT=$(type -P cat)
HEAD=$(type -P head)
CUT=$(type -P cut)
PS=$(type -P ps)
TAIL=$(type -P tail)

_parseAndPrint() {
while read data; do
$ECHO -n "$data" | $SED -r "s/\"/\\\\\"/g" | $TR -d "\n";
$ECHO -n "$data" | $SED -r 's/\\//g' | $TR -d "\n";
done;
}

Expand Down Expand Up @@ -109,6 +110,18 @@ cpu_temp() {
esac
}

# Explore sensors -u -j flags for easy output processs
cpu_multi_temp () {
result=$(sensors | grep 'Core' \
| $SED 's/ */ /g' \
| $CUT -d' ' -f1-3 \
| $TR -d '+' \
| $SED "s/°C//g" \
| $AWK -F: '{print "\""$1"\": \""$2"\"," } ' \
)
$ECHO "{" ${result%?} "}" | _parseAndPrint
}

# by Paul Colby (http://colby.id.au), no rights reserved ;)
cpu_utilization() {

Expand Down
4 changes: 2 additions & 2 deletions src/js/core/features/plugin/plugin.css
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

.plugin.chart-plugin {
padding: 0px;
resize: none;
#resize: none;
padding-bottom: 0;
}

Expand All @@ -77,7 +77,7 @@
}

.plugin-body-short {
height: 263px;
height: 294px;
}

.plugin last-update{
Expand Down
2 changes: 1 addition & 1 deletion src/js/core/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function routesFn($routeProvider) {
'<ram-chart sortablejs-id="ram-chart"></ram-chart> ',
'<cpu-avg-load-chart sortablejs-id="cpu-avg-load-chart"></cpu-avg-load-chart> ',
'<cpu-utilization-chart sortablejs-id="cpu-util-chart"></cpu-utilization-chart> ',
'<cpu-temp sortablejs-id="cpu-temp"></cpu-temp> ',
'<cpu-multi-temp-chart sortablejs-id="cpu-multi-temp-chart"></cpu-multi-temp-chart> ',
'<ram-intensive-processes sortablejs-id="ram-intensive-processes"></ram-intensive-processes> ',
'<cpu-intensive-processes sortablejs-id="cpu-intensive-processes"></cpu-intensive-processes> ',
'<disk-space sortablejs-id="disk-space"></disk-space> ',
Expand Down
16 changes: 16 additions & 0 deletions src/js/plugins/cpu-multi-temp-chart.directive.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
angular.module('linuxDash').directive('cpuMultiTempChart', ['server', function(server) {
return {
restrict: 'E',
scope: {},
template: '\
<multi-line-chart-plugin \
heading="CPU Multi Temp" \
module-name="cpu_multi_temp" \
units="units"> \
</multi-line-chart-plugin> \
',
link: function(scope) {
scope.units = 'ºC'
}
}
}])