Auto deploy from GitHub Actions build 379

[0f10598] iBug: Revert "mirrors/monitor: Change script to output integers"

assets/mirrors/connection.sh

@@ -2,5 +2,5 @@
 
 port_list_input=${1//:/|}
 port_list=${port_list_input:-"80|443"}
-netstat -ntW | gawk '{print tolower($6),gensub(/^(.+):([^:]+)$/,"\\1 \\2","g",$4)}' | grep -P " ($port_list)\$" | sort | uniq -c | sort -k 4 -k 3 | awk "{printf(\"connection,protocol=tcp,port=%s,address=%s %s=%si\n\",\$4,\$3,\$2,\$1)}"
-netstat -ntW | gawk '{print tolower($6),gensub(/^(.+):([^:]+)$/,"\\2","g",$4)}' | grep -P " ($port_list)\$" | sort | uniq -c | sort -k 3 | awk "{printf(\"connection,protocol=tcp,port=%s,address=any %s=%si\n\",\$3,\$2,\$1)}"
+netstat -ntW | gawk '{print tolower($6),gensub(/^(.+):([^:]+)$/,"\\1 \\2","g",$4)}' | grep -P " ($port_list)\$" | sort | uniq -c | sort -k 4 -k 3 | awk "{printf(\"connection,protocol=tcp,port=%s,address=%s %s=%s\n\",\$4,\$3,\$2,\$1)}"
+netstat -ntW | gawk '{print tolower($6),gensub(/^(.+):([^:]+)$/,"\\2","g",$4)}' | grep -P " ($port_list)\$" | sort | uniq -c | sort -k 3 | awk "{printf(\"connection,protocol=tcp,port=%s,address=any %s=%s\n\",\$3,\$2,\$1)}"

assets/mirrors/nfacct.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-sudo nfacct list | awk '-F[ ,;]' "{printf(\"nfacct,object=%s bytes=%ii,pkgs=%ii\n\",\$11,\$8,\$4)}"
+sudo nfacct list | awk '-F[ ,;]' "{printf(\"nfacct,object=%s bytes=%i,pkgs=%i\n\",\$11,\$8,\$4)}"

assets/mirrors/process.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ps -e -o s= -o comm= | grep -v '^S' | sort | uniq -c | awk '{printf("process,state=%s,name=%s count=%ii\n",$2,$3,$1)}'
+ps -e -o s= -o comm= | grep -v '^S' | sort | uniq -c | awk '{printf("process,state=%s,name=%s count=%i\n",$2,$3,$1)}'

services/mirrors/monitor/index.html

@@ -2596,16 +2596,16 @@ <h2 id="connections-users-online">Connections (Users online)<a class="headerlink
 <a id="__codelineno-1-2" name="__codelineno-1-2" href="#__codelineno-1-2"></a>
 <a id="__codelineno-1-3" name="__codelineno-1-3" href="#__codelineno-1-3"></a><span class="nv">port_list_input</span><span class="o">=</span><span class="si">${</span><span class="nv">1</span><span class="p">//:/|</span><span class="si">}</span>
 <a id="__codelineno-1-4" name="__codelineno-1-4" href="#__codelineno-1-4"></a><span class="nv">port_list</span><span class="o">=</span><span class="si">${</span><span class="nv">port_list_input</span><span class="k">:-</span><span class="s2">&quot;80|443&quot;</span><span class="si">}</span>
-<a id="__codelineno-1-5" name="__codelineno-1-5" href="#__codelineno-1-5"></a>netstat<span class="w"> </span>-ntW<span class="w"> </span><span class="p">|</span><span class="w"> </span>gawk<span class="w"> </span><span class="s1">&#39;{print tolower($6),gensub(/^(.+):([^:]+)$/,&quot;\\1 \\2&quot;,&quot;g&quot;,$4)}&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-P<span class="w"> </span><span class="s2">&quot; (</span><span class="nv">$port_list</span><span class="s2">)\$&quot;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-k<span class="w"> </span><span class="m">4</span><span class="w"> </span>-k<span class="w"> </span><span class="m">3</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s2">&quot;{printf(\&quot;connection,protocol=tcp,port=%s,address=%s %s=%si\n\&quot;,\$4,\$3,\$2,\$1)}&quot;</span>
-<a id="__codelineno-1-6" name="__codelineno-1-6" href="#__codelineno-1-6"></a>netstat<span class="w"> </span>-ntW<span class="w"> </span><span class="p">|</span><span class="w"> </span>gawk<span class="w"> </span><span class="s1">&#39;{print tolower($6),gensub(/^(.+):([^:]+)$/,&quot;\\2&quot;,&quot;g&quot;,$4)}&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-P<span class="w"> </span><span class="s2">&quot; (</span><span class="nv">$port_list</span><span class="s2">)\$&quot;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-k<span class="w"> </span><span class="m">3</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s2">&quot;{printf(\&quot;connection,protocol=tcp,port=%s,address=any %s=%si\n\&quot;,\$3,\$2,\$1)}&quot;</span>
+<a id="__codelineno-1-5" name="__codelineno-1-5" href="#__codelineno-1-5"></a>netstat<span class="w"> </span>-ntW<span class="w"> </span><span class="p">|</span><span class="w"> </span>gawk<span class="w"> </span><span class="s1">&#39;{print tolower($6),gensub(/^(.+):([^:]+)$/,&quot;\\1 \\2&quot;,&quot;g&quot;,$4)}&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-P<span class="w"> </span><span class="s2">&quot; (</span><span class="nv">$port_list</span><span class="s2">)\$&quot;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-k<span class="w"> </span><span class="m">4</span><span class="w"> </span>-k<span class="w"> </span><span class="m">3</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s2">&quot;{printf(\&quot;connection,protocol=tcp,port=%s,address=%s %s=%s\n\&quot;,\$4,\$3,\$2,\$1)}&quot;</span>
+<a id="__codelineno-1-6" name="__codelineno-1-6" href="#__codelineno-1-6"></a>netstat<span class="w"> </span>-ntW<span class="w"> </span><span class="p">|</span><span class="w"> </span>gawk<span class="w"> </span><span class="s1">&#39;{print tolower($6),gensub(/^(.+):([^:]+)$/,&quot;\\2&quot;,&quot;g&quot;,$4)}&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-P<span class="w"> </span><span class="s2">&quot; (</span><span class="nv">$port_list</span><span class="s2">)\$&quot;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span>-k<span class="w"> </span><span class="m">3</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s2">&quot;{printf(\&quot;connection,protocol=tcp,port=%s,address=any %s=%s\n\&quot;,\$3,\$2,\$1)}&quot;</span>
 </code></pre></div>
 <div class="highlight"><span class="filename">/opt/monitor/telegraf/nfacct.sh</span><pre><span></span><code><a id="__codelineno-2-1" name="__codelineno-2-1" href="#__codelineno-2-1"></a><span class="ch">#!/bin/bash</span>
 <a id="__codelineno-2-2" name="__codelineno-2-2" href="#__codelineno-2-2"></a>
-<a id="__codelineno-2-3" name="__codelineno-2-3" href="#__codelineno-2-3"></a>sudo<span class="w"> </span>nfacct<span class="w"> </span>list<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;-F[ ,;]&#39;</span><span class="w"> </span><span class="s2">&quot;{printf(\&quot;nfacct,object=%s bytes=%ii,pkgs=%ii\n\&quot;,\$11,\$8,\$4)}&quot;</span>
+<a id="__codelineno-2-3" name="__codelineno-2-3" href="#__codelineno-2-3"></a>sudo<span class="w"> </span>nfacct<span class="w"> </span>list<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;-F[ ,;]&#39;</span><span class="w"> </span><span class="s2">&quot;{printf(\&quot;nfacct,object=%s bytes=%i,pkgs=%i\n\&quot;,\$11,\$8,\$4)}&quot;</span>
 </code></pre></div>
 <div class="highlight"><span class="filename">/opt/monitor/telegraf/process.sh</span><pre><span></span><code><a id="__codelineno-3-1" name="__codelineno-3-1" href="#__codelineno-3-1"></a><span class="ch">#!/bin/bash</span>
 <a id="__codelineno-3-2" name="__codelineno-3-2" href="#__codelineno-3-2"></a>
-<a id="__codelineno-3-3" name="__codelineno-3-3" href="#__codelineno-3-3"></a>ps<span class="w"> </span>-e<span class="w"> </span>-o<span class="w"> </span><span class="nv">s</span><span class="o">=</span><span class="w"> </span>-o<span class="w"> </span><span class="nv">comm</span><span class="o">=</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-v<span class="w"> </span><span class="s1">&#39;^S&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;{printf(&quot;process,state=%s,name=%s count=%ii\n&quot;,$2,$3,$1)}&#39;</span>
+<a id="__codelineno-3-3" name="__codelineno-3-3" href="#__codelineno-3-3"></a>ps<span class="w"> </span>-e<span class="w"> </span>-o<span class="w"> </span><span class="nv">s</span><span class="o">=</span><span class="w"> </span>-o<span class="w"> </span><span class="nv">comm</span><span class="o">=</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>grep<span class="w"> </span>-v<span class="w"> </span><span class="s1">&#39;^S&#39;</span><span class="w"> </span><span class="p">|</span><span class="w"> </span>sort<span class="w"> </span><span class="p">|</span><span class="w"> </span>uniq<span class="w"> </span>-c<span class="w"> </span><span class="p">|</span><span class="w"> </span>awk<span class="w"> </span><span class="s1">&#39;{printf(&quot;process,state=%s,name=%s count=%i\n&quot;,$2,$3,$1)}&#39;</span>
 </code></pre></div>