X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=x2%2Fsrc%2Fbash%2Fexe%2Fkhatus.sh;h=10ddcebba78369962fb640597014dbffd78dde67;hb=95f1355c008d27df7344c59e12ce6284efaaadef;hp=ec8270f6c73da8c4a730f50dbfb1de44aa775366;hpb=499c58a269a00e031302938b5a8f006f23aae451;p=khatus.git

diff --git a/x2/src/bash/exe/khatus.sh b/x2/src/bash/exe/khatus.sh
index ec8270f..10ddceb 100644
--- a/x2/src/bash/exe/khatus.sh
+++ b/x2/src/bash/exe/khatus.sh
@@ -85,6 +85,19 @@ fork_poller() {
     done &
 }
 
+find_thermal_zone() {
+    local -r _type="$1"
+    awk \
+        -v _type="$_type" \
+        '
+        $0 ~ ("^" _type "$") {
+            split(FILENAME, f, "thermal_zone");
+            split(f[2], f2, "/");
+            print f2[1]}
+        ' \
+        /sys/class/thermal/thermal_zone*/type
+}
+
 main() {
     declare -A opts=(
         ["--node"]=$(hostname)
@@ -96,7 +109,7 @@ main() {
         ["--wifi_interface"]=''
         ["--disk_space_device"]='/'
         ["--disk_io_device"]='sda'
-        ["--thermal_zone"]=0
+        ["--thermal_zone"]="$(find_thermal_zone x86_pkg_temp)"
         ["--fan_path"]='/proc/acpi/ibm/fan'
         ["--pulseaudio_sink"]='0'
         ["--interval_datetime"]=1
@@ -108,6 +121,7 @@ main() {
         ["--interval_bluetooth"]=1
         ["--interval_net_wifi"]=1
         ["--interval_net_io"]=1
+        ["--interval_net_carrier"]=1
         ["--interval_disk_space"]=1
         ["--interval_disk_io"]=1
         ["--interval_loadavg"]=1
@@ -199,6 +213,7 @@ main() {
     fork_poller "${opts['--interval_mpd']}"        "$perf" "$pipe" "$bin" "$cmd_sens_mpd"
     fork_poller "${opts['--interval_volume']}"     "$perf" "$pipe" "$bin" "$cmd_sens_volume"
     fork_poller "${opts['--interval_bluetooth']}"  "$perf" "$pipe" "$bin" "$cmd_sens_bluetooth"
+    fork_poller "${opts['--interval_bluetooth']}"  "$perf" "$pipe" "$bin" 'khatus_sensor_bluetooth'
     fork_poller "${opts['--interval_net_wifi']}"   "$perf" "$pipe" "$bin" "$cmd_sens_wifi"
     fork_poller "${opts['--interval_net_io']}"     "$perf" "$pipe" "$bin" "$cmd_sens_net_addr_io"
     fork_poller "${opts['--interval_disk_space']}" "$perf" "$pipe" "$bin" "$cmd_sens_disk_space"
@@ -207,6 +222,7 @@ main() {
     fork_poller "${opts['--interval_temp']}"       "$perf" "$pipe" "$bin" "$cmd_sens_temperature"
     fork_poller "${opts['--interval_fan']}"        "$perf" "$pipe" "$bin" "$cmd_sens_fan"
     fork_poller "${opts['--interval_mem']}"        "$perf" "$pipe" "$bin" "$cmd_sens_memory"
+    fork_poller "${opts['--interval_net_carrier']}" "$perf" "$pipe" "$bin" khatus_sensor_net_carrier
 
     stdbuf -o L tail -f "$pipe"
 }