summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xINSTALL.sh38
-rw-r--r--Makefile4
-rwxr-xr-xbin-src/crtsh-getcerts2
-rw-r--r--bin-src/crtsh-pem2html.go2
-rw-r--r--bin-src/diff-pem2html.go2
-rw-r--r--bin-src/httpd.go35
-rw-r--r--bin-src/pem-diff.go2
-rw-r--r--bin-src/tls-pem2html.go2
-rw-r--r--cfg/domains.txt8
-rw-r--r--cfg/jarmon-mav.js83
-rw-r--r--cfg/jarmon-proton.js143
-rw-r--r--cfg/jarmon-winston.js64
-rw-r--r--cfg/sockets.txt12
-rw-r--r--go.mod3
-rw-r--r--public-src/3rd-party/package.json6
-rw-r--r--public-src/3rd-party/yarn.lock14
-rw-r--r--public-src/main.js9
-rw-r--r--public-src/require.config.js2
-rw-r--r--public-src/sorttable.js495
-rw-r--r--systemd/dashboard-httpd.service6
-rw-r--r--systemd/dashboard-httpd.socket8
21 files changed, 211 insertions, 729 deletions
diff --git a/INSTALL.sh b/INSTALL.sh
index 845abce..daf0e9c 100755
--- a/INSTALL.sh
+++ b/INSTALL.sh
@@ -1,23 +1,23 @@
#!/bin/sh
-set -ex
-
-# Go
-sudo pacman -S --needed -- go
-
-# Ruby
-sudo pacman -S --needed -- ruby
+# 1. Git clone to ~/dashboard (`INSTALL.sh` and `systemd/*.service` assume that path)
+# 2. Run `./INSTALL.sh`
+# 3. Run `make`
+# 4. Go to http://localhost:41198
+#
+# 5. (Optional) I set by Firefox homepage to that (configured at
+# about:preferences#home), and use
+# https://addons.mozilla.org/en-US/firefox/addon/new-tab-override/
+# to have the new-tab-page be my homepage.
-# Nokogiri
-sudo pacman -S --needed -- ruby libxslt
-gem install nokogiri -- --use-system-libraries
-
-# SCSS
-sudo pacman -S --needed -- ruby-sass
-#sudo pacman -S --needed -- ruby
-#gem install sass
+set -ex
-# Yarn
-sudo pacman -S --needed -- yarn
+sudo pacman -S --needed -- \
+ go \
+ ruby-nokogiri \
+ ruby-sass \
+ yarn \
+ wget
-# Wget
-sudo pacman -S --needed -- wget
+mkdir -p -- ~/.config/systemd/user/
+ln -srf -- ~/dashboard/systemd/* ~/.config/systemd/user/
+systemctl --user enable --now dashboard-daily.timer dashboard-httpd.socket
diff --git a/Makefile b/Makefile
index f88fb95..7ee6e91 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ outs = $(patsubst public-src/%,public/%,\
$(srcs))))
all: $(outs)
all: public/3rd-party
+all: bin/cron-daily bin/httpd
.PHONY: all
NET-%:
@@ -57,11 +58,8 @@ public-src/3rd-party/yarn.LICENSES.txt: bin/yarn-bower public-src/3rd-party/pack
bin/yarn-bower install
bin/yarn-bower licenses generate-disclaimer > $@
public/3rd-party: public-src/3rd-party/yarn.LICENSES.txt
-public/3rd-party: public-src/3rd-party/jquery-1.6.3.js
public/3rd-party:
ln -srTf public-src/3rd-party '$@'
@test -d $@ && touch $@
public-src/jarmon-style/%.gif: public-src/3rd-party/yarn.LICENSES.txt
@test -f $@
-public-src/3rd-party/jquery-%.js:
- wget -O - 'http://code.jquery.com/jquery-$*.js' > $@
diff --git a/bin-src/crtsh-getcerts b/bin-src/crtsh-getcerts
index 0191e2e..f01a4c7 100755
--- a/bin-src/crtsh-getcerts
+++ b/bin-src/crtsh-getcerts
@@ -5,7 +5,7 @@ require 'open-uri'
certs = {}
ARGV.each do |domain|
[ domain, "%.#{domain}" ].each do |pattern|
- Nokogiri::XML(open("https://crt.sh/atom?identity=#{pattern}&exclude=expired")).css('feed > entry').each do |entry|
+ Nokogiri::XML(URI.open("https://crt.sh/atom?"+URI.encode_www_form("identity" => pattern, "exclude" => "expired"))).css('feed > entry').each do |entry|
url = entry.css('id').first.text.split("#").first
updated = entry.css('updated').first.text
diff --git a/bin-src/crtsh-pem2html.go b/bin-src/crtsh-pem2html.go
index bb1e98e..1f2932a 100644
--- a/bin-src/crtsh-pem2html.go
+++ b/bin-src/crtsh-pem2html.go
@@ -10,7 +10,7 @@ import (
"sort"
"time"
- "./util"
+ "git.lukeshu.com/dashboard/bin-src/util"
)
func handleErr(err error, str string, a ...interface{}) {
diff --git a/bin-src/diff-pem2html.go b/bin-src/diff-pem2html.go
index f3b25ff..ba5be80 100644
--- a/bin-src/diff-pem2html.go
+++ b/bin-src/diff-pem2html.go
@@ -8,7 +8,7 @@ import (
"io/ioutil"
"os"
- "./util"
+ "git.lukeshu.com/dashboard/bin-src/util"
)
func handleErr(err error, str string, a ...interface{}) {
diff --git a/bin-src/httpd.go b/bin-src/httpd.go
new file mode 100644
index 0000000..6b653bd
--- /dev/null
+++ b/bin-src/httpd.go
@@ -0,0 +1,35 @@
+package main
+
+import (
+ "errors"
+ "fmt"
+ "net"
+ "net/http"
+ "os"
+ "path/filepath"
+)
+
+func mainWithError() error {
+ listenerFile := os.NewFile(uintptr(3), "listener")
+ if listenerFile == nil {
+ return errors.New("FD3 is not open")
+ }
+
+ listener, err := net.FileListener(listenerFile)
+ if err != nil {
+ return err
+ }
+
+ if err := os.Chdir(filepath.Dir(filepath.Dir(os.Args[0]))); err != nil {
+ return err
+ }
+
+ return http.Serve(listener, http.FileServer(http.Dir("public")))
+}
+
+func main() {
+ if err := mainWithError(); err != nil {
+ fmt.Fprintf(os.Stderr, "%s: error: %v\n", os.Args[0], err)
+ os.Exit(1)
+ }
+}
diff --git a/bin-src/pem-diff.go b/bin-src/pem-diff.go
index 0159349..acda685 100644
--- a/bin-src/pem-diff.go
+++ b/bin-src/pem-diff.go
@@ -11,7 +11,7 @@ import (
"sort"
"strings"
- "./util"
+ "git.lukeshu.com/dashboard/bin-src/util"
)
func handleErr(err error, str string, a ...interface{}) {
diff --git a/bin-src/tls-pem2html.go b/bin-src/tls-pem2html.go
index bc14f9a..02b38a0 100644
--- a/bin-src/tls-pem2html.go
+++ b/bin-src/tls-pem2html.go
@@ -10,7 +10,7 @@ import (
"sort"
"time"
- "./util"
+ "git.lukeshu.com/dashboard/bin-src/util"
)
func handleErr(err error, str string, a ...interface{}) {
diff --git a/cfg/domains.txt b/cfg/domains.txt
index 01e7cf4..eb05b30 100644
--- a/cfg/domains.txt
+++ b/cfg/domains.txt
@@ -3,9 +3,5 @@ parabolagnulinux.org
lukeshu.com
-andrewdm.me
-
-datawire.io
-getambassador.io
-telepresence.io
-kubernaut.io
+umorpha.io
+mothstuff.lol
diff --git a/cfg/jarmon-mav.js b/cfg/jarmon-mav.js
new file mode 100644
index 0000000..d028753
--- /dev/null
+++ b/cfg/jarmon-mav.js
@@ -0,0 +1,83 @@
+define(['jarmon'], function(jarmon) {
+ var srv = 'https://mav.lukeshu.com/collectd/mav.lukeshu.com/'
+
+ var tabRecipes = [
+ ['Overview', ['load', 'memory']],
+
+ ['CPU', ['load', 'cpu-0']],
+ ['Net', ['interface-ens3', 'interface-lo', 'interface-lvpn']],
+ ];
+
+ var cpu = function(title, baseUrl) {
+ return {
+ title: title,
+ data: [
+ [baseUrl+'cpu-steal.rrd', 0, 'Steal', 'jiffy'],
+ [baseUrl+'cpu-interrupt.rrd', 0, 'IRQ', 'jiffy'],
+ [baseUrl+'cpu-softirq.rrd', 0, 'SoftIRQ', 'jiffy'],
+ [baseUrl+'cpu-system.rrd', 0, 'System', 'jiffy'],
+ [baseUrl+'cpu-wait.rrd', 0, 'IO', 'jiffy'],
+ [baseUrl+'cpu-user.rrd', 0, 'User', 'jiffy'],
+ //[baseUrl+'cpu-nice.rrd', 0, 'Nice', 'jiffy'],
+ [baseUrl+'cpu-idle.rrd', 0, 'Idle', 'jiffy'],
+ ],
+ options: jQuery.extend(true, {},
+ jarmon.Chart.BASE_OPTIONS,
+ jarmon.Chart.STACKED_OPTIONS,
+ {yaxis: {min: 0, max: 110}})
+ };
+ };
+
+ var netIface = function(title, baseUrl) {
+ return {
+ title: title,
+ data: [
+ [baseUrl+'if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
+ [baseUrl+'if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
+ ],
+ options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+ };
+ };
+
+ var chartRecipes = {
+ 'cpu-0': cpu("CPU-0 Usage", srv+'cpu-0/'),
+
+ 'interface-ens3': netIface('ens3 Throughput', srv+'interface-ens3/'),
+ 'interface-lo': netIface('lo Throughput', srv+'interface-lo/'),
+ 'interface-lvpn': netIface('lvpn Throughput', srv+'interface-lvpn/'),
+
+ 'load': {
+ title: 'Load Average',
+ data: [
+ [srv+'load/load.rrd', 'shortterm', 'Short Term (1m)', ''],
+ [srv+'load/load.rrd', 'midterm', 'Medium Term (5m)', ''],
+ [srv+'load/load.rrd', 'longterm', 'Long Term (15m)', '']
+ ],
+ options: jQuery.extend(true, {},
+ jarmon.Chart.BASE_OPTIONS,
+ {yaxis: {min: 0}})
+ },
+
+ 'memory': {
+ title: 'Memory',
+ data: [
+ [srv+'memory/memory-used.rrd', 0, 'Used', 'B'],
+ [srv+'memory/memory-slab_unrecl.rrd', 0, 'Slab', 'B'],
+ [srv+'memory/memory-slab_recl.rrd', 0, 'Slab (Recl)', 'B'],
+ [srv+'memory/memory-cached.rrd', 0, 'Cached', 'B'],
+ [srv+'memory/memory-buffered.rrd', 0, 'Buffered', 'B'],
+ [srv+'memory/memory-free.rrd', 0, 'Free', 'B']
+ ],
+ options: jQuery.extend(true, {},
+ jarmon.Chart.BASE_OPTIONS,
+ jarmon.Chart.STACKED_OPTIONS)
+ },
+
+ };
+
+ return {
+ name: 'mav',
+ chartRecipes,
+ tabRecipes
+ };
+});
diff --git a/cfg/jarmon-proton.js b/cfg/jarmon-proton.js
deleted file mode 100644
index 28afef2..0000000
--- a/cfg/jarmon-proton.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/* Copyright (c) Richard Wall
- * See LICENSE for details.
- *
- * Some example recipes for Collectd RRD data - you *will* need to modify this
- * based on the RRD data available on your system.
- */
-define(['jarmon'], function(jarmon) {
- var srv = 'https://proton.parabola.nu/collectd/proton.parabola.nu/'
-
- var tabRecipes = [
- ['Overview', ['cpu', 'memory', 'swap-use']],
- ['Iface', ['interface-inet', 'interface-lvpn', 'interface-lo']],
- ['Other', ['load', 'swap-use', 'swap-io', 'users', 'entropy', 'uptime']],
- ];
-
- var chartRecipes = {
- 'cpu': {
- title: 'CPU Usage',
- data: [
- [srv+'cpu-0/cpu-steal.rrd', 0, 'Steal', 'jiffy'],
- [srv+'cpu-0/cpu-interrupt.rrd', 0, 'IRQ', 'jiffy'],
- [srv+'cpu-0/cpu-softirq.rrd', 0, 'SoftIRQ', 'jiffy'],
- [srv+'cpu-0/cpu-system.rrd', 0, 'System', 'jiffy'],
- [srv+'cpu-0/cpu-wait.rrd', 0, 'IO', 'jiffy'],
- [srv+'cpu-0/cpu-user.rrd', 0, 'User', 'jiffy'],
- //[srv+'cpu-0/cpu-nice.rrd', 0, 'Nice', 'jiffy'],
- [srv+'cpu-0/cpu-idle.rrd', 0, 'Idle', 'jiffy'],
- ],
- options: jQuery.extend(true, {},
- jarmon.Chart.BASE_OPTIONS,
- jarmon.Chart.STACKED_OPTIONS,
- {yaxis: {min: 0, max: 110}})
- },
-
- 'memory': {
- title: 'Memory',
- data: [
- [srv+'memory/memory-used.rrd', 0, 'Used', 'B'],
- [srv+'memory/memory-slab_unrecl.rrd', 0, 'Slab', 'B'],
- [srv+'memory/memory-slab_recl.rrd', 0, 'Slab (Recl)', 'B'],
- [srv+'memory/memory-cached.rrd', 0, 'Cached', 'B'],
- [srv+'memory/memory-buffered.rrd', 0, 'Buffered', 'B'],
- [srv+'memory/memory-free.rrd', 0, 'Free', 'B']
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
- jarmon.Chart.STACKED_OPTIONS)
- },
-
- 'load': {
- title: 'Load Average',
- data: [
- [srv+'load/load.rrd', 'shortterm', 'Short Term (1m)', ''],
- [srv+'load/load.rrd', 'midterm', 'Medium Term (5m)', ''],
- [srv+'load/load.rrd', 'longterm', 'Long Term (15m)', '']
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'interface-inet': {
- title: 'ens18 Throughput',
- data: [
- [srv+'interface-ens18/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-ens18/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'interface-lvpn': {
- title: 'lvpn Throughput',
- data: [
- [srv+'interface-lvpn/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-lvpn/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'interface-lo': {
- title: 'lo Throughput',
- data: [
- [srv+'interface-lo/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-lo/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'entropy': {
- title: 'Entropy',
- data: [
- [srv+'entropy/entropy.rrd', 0, 'Entropy', 'b']
- ],
- options: jQuery.extend(true, {},
- jarmon.Chart.BASE_OPTIONS,
- {series: {lines: {fill: 0.5}}})
- },
-
- 'users': {
- title: 'Users',
- data: [
- [srv+'users/users.rrd', 0, 'Users', 'users']
- ],
- options: jQuery.extend(true, {},
- jarmon.Chart.BASE_OPTIONS,
- {series: {lines: {fill: 0.5}}})
- },
-
- 'uptime': {
- title: 'Uptime',
- data: [
- [srv+'uptime/uptime.rrd', 0, 'Uptime', 'days', function(v) { return v/(60*60*24); }]
- ],
- options: jQuery.extend(true, {},
- jarmon.Chart.BASE_OPTIONS,
- {series: {lines: {fill: 0.5}}})
- },
-
- 'swap-use': {
- title: 'Swap Usage',
- data: [
- [srv+'swap/swap-used.rrd', 0, 'Used', 'B'],
- [srv+'swap/swap-cached.rrd', 0, 'Cached', 'B'],
- [srv+'swap/swap-free.rrd', 0, 'Free', 'B']
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS,
- jarmon.Chart.STACKED_OPTIONS)
- },
-
- 'swap-io': {
- title: 'Swap IO',
- data: [
- // In pages unless the Swap.ReportBytes option is set
- [srv+'swap/swap_io-in.rrd', 0, 'In', 'page'],
- [srv+'swap/swap_io-out.rrd', 0, 'Out', 'page']
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- }
- };
-
- return {
- name: 'proton',
- chartRecipes,
- tabRecipes,
- };
-});
diff --git a/cfg/jarmon-winston.js b/cfg/jarmon-winston.js
index 25effbf..0d36940 100644
--- a/cfg/jarmon-winston.js
+++ b/cfg/jarmon-winston.js
@@ -1,19 +1,13 @@
-/* Copyright (c) Richard Wall
- * See LICENSE for details.
- *
- * Some example recipes for Collectd RRD data - you *will* need to modify this
- * based on the RRD data available on your system.
- */
define(['jarmon'], function(jarmon) {
var srv = 'https://winston.parabola.nu/collectd/winston.parabola.nu/'
var tabRecipes = [
['Overview', ['load', 'memory', 'swap-use', 'df-vda3', 'df-vda4', 'systemd-units', 'systemd-jobs', 'uptime']],
- ['CPU', ['load', 'cpu-0', 'cpu-1', 'cpu-2', 'cpu-3', 'cpu-4', 'cpu-5', 'cpu-6', 'cpu-7', 'uptime']],
+ ['CPU', ['load', 'cpu-0', 'cpu-1', 'uptime']],
['Disk', ['df-vda3', 'df-vda4', 'uptime']],
['Memory', ['memory', 'swap-use', 'swap-io', 'uptime']],
- ['Net', ['interface-eth0', 'interface-lo', 'interface-lvpn', 'uptime']],
+ ['Net', ['interface-eth0', 'interface-lo', 'interface-lvpn', 'interface-sit0', 'interface-tunnelipv6', 'uptime']],
['Other', ['entropy', 'uptime', 'users', 'uptime']],
];
@@ -38,15 +32,20 @@ define(['jarmon'], function(jarmon) {
};
};
+ var netIface = function(title, baseUrl) {
+ return {
+ title: title,
+ data: [
+ [baseUrl+'if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
+ [baseUrl+'if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
+ ],
+ options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
+ };
+ };
+
var chartRecipes = {
'cpu-0': cpu("CPU-0 Usage", srv+'cpu-0/'),
'cpu-1': cpu("CPU-1 Usage", srv+'cpu-1/'),
- 'cpu-2': cpu("CPU-2 Usage", srv+'cpu-2/'),
- 'cpu-3': cpu("CPU-3 Usage", srv+'cpu-3/'),
- 'cpu-4': cpu("CPU-4 Usage", srv+'cpu-4/'),
- 'cpu-5': cpu("CPU-5 Usage", srv+'cpu-5/'),
- 'cpu-6': cpu("CPU-6 Usage", srv+'cpu-6/'),
- 'cpu-7': cpu("CPU-7 Usage", srv+'cpu-7/'),
'df-vda3': {
title: "df /dev/vda3",
@@ -82,32 +81,11 @@ define(['jarmon'], function(jarmon) {
{series: {lines: {fill: 0.5}}})
},
- 'interface-eth0': {
- title: 'eth0 Throughput',
- data: [
- [srv+'interface-eth0/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-eth0/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'interface-lo': {
- title: 'lo Throughput',
- data: [
- [srv+'interface-lo/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-lo/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
-
- 'interface-lvpn': {
- title: 'lvpn Throughput',
- data: [
- [srv+'interface-lvpn/if_octets.rrd', 'tx', 'Transmit', 'bit/s', function (v) { return -v*8; }],
- [srv+'interface-lvpn/if_octets.rrd', 'rx', 'Receive', 'bit/s', function (v) { return v*8; }]
- ],
- options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS)
- },
+ 'interface-eth0': netIface('eth0 Throughput', srv+'interface-eth0/'),
+ 'interface-lo': netIface('lo Throughput', srv+'interface-lo/'),
+ 'interface-lvpn': netIface('lvpn Throughput', srv+'interface-lvpn/'),
+ 'interface-sit0': netIface('sit0 Throughput', srv+'interface-sit0/'),
+ 'interface-tunnelipv6': netIface('tunnelipv6 Throughput', srv+'interface-tunnelipv6/'),
'load': {
title: 'Load Average',
@@ -169,7 +147,8 @@ define(['jarmon'], function(jarmon) {
options: jQuery.extend(true, {},
jarmon.Chart.BASE_OPTIONS,
jarmon.Chart.STACKED_OPTIONS,
- {series: {lines: {zero: false}}})
+ {series: {lines: {zero: false}},
+ yaxis: {minTickSize: 1}})
},
'systemd-jobs': {
title: 'Systemd jobs',
@@ -181,7 +160,8 @@ define(['jarmon'], function(jarmon) {
options: jQuery.extend(true, {},
jarmon.Chart.BASE_OPTIONS,
jarmon.Chart.STACKED_OPTIONS,
- {series: {lines: {zero: false}}})
+ {series: {lines: {zero: false}},
+ yaxis: {minTickSize: 1}})
},
'uptime': {
diff --git a/cfg/sockets.txt b/cfg/sockets.txt
index 50e68ca..245a222 100644
--- a/cfg/sockets.txt
+++ b/cfg/sockets.txt
@@ -1,15 +1,17 @@
-tcp://parabola.nu:5222/xmpp
tcp://parabola.nu:587/smtp
tcp://winston.parabola.nu:443
+tcp://thwomp.parabola.nu:443
+tcp://dexter.parabola.nu:443
tcp://ramhost.lukeshu.com:443
+#tcp://openrc.lukeshu.com:443
tcp://mav.lukeshu.com:443
#tcp://mav.lukeshu.com:25/smtp
tcp://mav.lukeshu.com:587/smtp
tcp://mav.lukeshu.com:993
-tcp://neo.andrewdm.me:443
-
-tcp://next.kubernaut.io:443
-tcp://support.datawire.io:443
+tcp://luigi.mothstuff.lol:443
+tcp://mario.mothstuff.lol:443
+#tcp://sonic.mothstuff.lol:443
+#tcp://eggman.mothstuff.lol:443
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..2d127d7
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module git.lukeshu.com/dashboard
+
+go 1.20
diff --git a/public-src/3rd-party/package.json b/public-src/3rd-party/package.json
index 3393051..b07e0bd 100644
--- a/public-src/3rd-party/package.json
+++ b/public-src/3rd-party/package.json
@@ -1,13 +1,13 @@
{
"dependencies": {
- "flot": "git://github.com/flot/flot#v0.8.3",
+ "flot": "https://github.com/flot/flot#v0.8.3",
"golden-layout": "^1.5.9",
"jarmon": "git://git.lukeshu.com/2git/jarmon#lukeshu/master",
"javascriptrrd": "git://git.lukeshu.com/2git/javascriptrrd#v1.1.1",
"jquery": "^1.11",
"jquery-migrate": "^1.0",
- "jquerytools": "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068",
+ "jquerytools": "https://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068",
"requirejs": "^2.3.5",
- "sorttable": "git://github.com/stuartlangridge/sorttable"
+ "sorttable": "https://github.com/stuartlangridge/sorttable"
}
}
diff --git a/public-src/3rd-party/yarn.lock b/public-src/3rd-party/yarn.lock
index f971b63..bd3011f 100644
--- a/public-src/3rd-party/yarn.lock
+++ b/public-src/3rd-party/yarn.lock
@@ -2,9 +2,9 @@
# yarn lockfile v1
-"flot@git://github.com/flot/flot#v0.8.3":
+"flot@https://github.com/flot/flot#v0.8.3":
version "0.8.3"
- resolved "git://github.com/flot/flot#453b017cc5acfd75e252b93e8635f57f4196d45d"
+ resolved "https://github.com/flot/flot#453b017cc5acfd75e252b93e8635f57f4196d45d"
golden-layout@^1.5.9:
version "1.5.9"
@@ -14,7 +14,7 @@ golden-layout@^1.5.9:
"jarmon@git://git.lukeshu.com/2git/jarmon#lukeshu/master":
version "0.0.0"
- resolved "git://git.lukeshu.com/2git/jarmon#2836159a6a67e659e6634cc8d4505829596fc614"
+ resolved "git://git.lukeshu.com/2git/jarmon#1f15793cd594f533715f96ba90310dbc4a502c51"
"javascriptrrd@git://git.lukeshu.com/2git/javascriptrrd#v1.1.1":
version "0.0.0"
@@ -28,14 +28,14 @@ jquery@*, jquery@^1.11:
version "1.12.4"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.4.tgz#01e1dfba290fe73deba77ceeacb0f9ba2fec9e0c"
-"jquerytools@git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068":
+"jquerytools@https://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068":
version "0.0.0"
- resolved "git://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068"
+ resolved "https://github.com/jquerytools/jquerytools#8ac4636a01d3860f1c4726ba722190a531bf1068"
requirejs@^2.3.5:
version "2.3.5"
resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
-"sorttable@git://github.com/stuartlangridge/sorttable":
+"sorttable@https://github.com/stuartlangridge/sorttable":
version "2.0.0"
- resolved "git://github.com/stuartlangridge/sorttable#f0840b1f3c7a0f60983f0c6ddc1c4b1372b98b16"
+ resolved "https://github.com/stuartlangridge/sorttable#f0840b1f3c7a0f60983f0c6ddc1c4b1372b98b16"
diff --git a/public-src/main.js b/public-src/main.js
index a86a815..f084d0b 100644
--- a/public-src/main.js
+++ b/public-src/main.js
@@ -2,12 +2,14 @@ define([
'golden-layout',
'jarmon',
'./cfg/jarmon-winston.js',
+ './cfg/jarmon-mav.js',
'./components/gl/jarmon-tabbed-chart-ui.js',
'./components/gl/html.js',
], function(
GoldenLayout,
jarmon,
cfgWinston,
+ cfgMav,
glJarmon,
glHTML,
) {
@@ -35,6 +37,13 @@ define([
componentState: cfgWinston,
},
{
+ title: 'mav',
+ isClosable: false,
+ type: 'component',
+ componentName: 'jarmon:tabbed-chart-ui',
+ componentState: cfgMav,
+ },
+ {
title: 'TLS',
isClosable: false,
type: 'component',
diff --git a/public-src/require.config.js b/public-src/require.config.js
index ca9cca8..db3a0db 100644
--- a/public-src/require.config.js
+++ b/public-src/require.config.js
@@ -25,7 +25,7 @@ var require = {
"flot/jquery.flot.stack" : { deps: ["flot/jquery.flot"] },
// Jarmon configs
"cfg/jarmon-winston": { deps: ["jquery", "jarmon"] },
- "cfg/jarmon-proton": { deps: ["jquery", "jarmon"] },
+ "cfg/jarmon-mav": { deps: ["jquery", "jarmon"] },
},
paths: {
"flot" : "/3rd-party/yarn/flot",
diff --git a/public-src/sorttable.js b/public-src/sorttable.js
deleted file mode 100644
index 38b0fc6..0000000
--- a/public-src/sorttable.js
+++ /dev/null
@@ -1,495 +0,0 @@
-/*
- SortTable
- version 2
- 7th April 2007
- Stuart Langridge, http://www.kryogenix.org/code/browser/sorttable/
-
- Instructions:
- Download this file
- Add <script src="sorttable.js"></script> to your HTML
- Add class="sortable" to any table you'd like to make sortable
- Click on the headers to sort
-
- Thanks to many, many people for contributions and suggestions.
- Licenced as X11: http://www.kryogenix.org/code/browser/licence.html
- This basically means: do what you want with it.
-*/
-
-
-var stIsIE = /*@cc_on!@*/false;
-
-sorttable = {
- init: function() {
- // quit if this function has already been called
- if (arguments.callee.done) return;
- // flag this function so we don't do the same thing twice
- arguments.callee.done = true;
- // kill the timer
- if (_timer) clearInterval(_timer);
-
- if (!document.createElement || !document.getElementsByTagName) return;
-
- sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
-
- forEach(document.getElementsByTagName('table'), function(table) {
- if (table.className.search(/\bsortable\b/) != -1) {
- sorttable.makeSortable(table);
- }
- });
-
- },
-
- makeSortable: function(table) {
- if (table.getElementsByTagName('thead').length == 0) {
- // table doesn't have a tHead. Since it should have, create one and
- // put the first table row in it.
- the = document.createElement('thead');
- the.appendChild(table.rows[0]);
- table.insertBefore(the,table.firstChild);
- }
- // Safari doesn't support table.tHead, sigh
- if (table.tHead == null) table.tHead = table.getElementsByTagName('thead')[0];
-
- if (table.tHead.rows.length != 1) return; // can't cope with two header rows
-
- // Sorttable v1 put rows with a class of "sortbottom" at the bottom (as
- // "total" rows, for example). This is B&R, since what you're supposed
- // to do is put them in a tfoot. So, if there are sortbottom rows,
- // for backwards compatibility, move them to tfoot (creating it if needed).
- sortbottomrows = [];
- for (var i=0; i<table.rows.length; i++) {
- if (table.rows[i].className.search(/\bsortbottom\b/) != -1) {
- sortbottomrows[sortbottomrows.length] = table.rows[i];
- }
- }
- if (sortbottomrows) {
- if (table.tFoot == null) {
- // table doesn't have a tfoot. Create one.
- tfo = document.createElement('tfoot');
- table.appendChild(tfo);
- }
- for (var i=0; i<sortbottomrows.length; i++) {
- tfo.appendChild(sortbottomrows[i]);
- }
- delete sortbottomrows;
- }
-
- // work through each column and calculate its type
- headrow = table.tHead.rows[0].cells;
- for (var i=0; i<headrow.length; i++) {
- // manually override the type with a sorttable_type attribute
- if (!headrow[i].className.match(/\bsorttable_nosort\b/)) { // skip this col
- mtch = headrow[i].className.match(/\bsorttable_([a-z0-9]+)\b/);
- if (mtch) { override = mtch[1]; }
- if (mtch && typeof sorttable["sort_"+override] == 'function') {
- headrow[i].sorttable_sortfunction = sorttable["sort_"+override];
- } else {
- headrow[i].sorttable_sortfunction = sorttable.guessType(table,i);
- }
- // make it clickable to sort
- headrow[i].sorttable_columnindex = i;
- headrow[i].sorttable_tbody = table.tBodies[0];
- dean_addEvent(headrow[i],"click", sorttable.innerSortFunction = function(e) {
-
- if (this.className.search(/\bsorttable_sorted\b/) != -1) {
- // if we're already sorted by this column, just
- // reverse the table, which is quicker
- sorttable.reverse(this.sorttable_tbody);
- this.className = this.className.replace('sorttable_sorted',
- 'sorttable_sorted_reverse');
- this.removeChild(document.getElementById('sorttable_sortfwdind'));
- sortrevind = document.createElement('span');
- sortrevind.id = "sorttable_sortrevind";
- sortrevind.innerHTML = stIsIE ? '&nbsp<font face="webdings">5</font>' : '&nbsp;&#x25B4;';
- this.appendChild(sortrevind);
- return;
- }
- if (this.className.search(/\bsorttable_sorted_reverse\b/) != -1) {
- // if we're already sorted by this column in reverse, just
- // re-reverse the table, which is quicker
- sorttable.reverse(this.sorttable_tbody);
- this.className = this.className.replace('sorttable_sorted_reverse',
- 'sorttable_sorted');
- this.removeChild(document.getElementById('sorttable_sortrevind'));
- sortfwdind = document.createElement('span');
- sortfwdind.id = "sorttable_sortfwdind";
- sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
- this.appendChild(sortfwdind);
- return;
- }
-
- // remove sorttable_sorted classes
- theadrow = this.parentNode;
- forEach(theadrow.childNodes, function(cell) {
- if (cell.nodeType == 1) { // an element
- cell.className = cell.className.replace('sorttable_sorted_reverse','');
- cell.className = cell.className.replace('sorttable_sorted','');
- }
- });
- sortfwdind = document.getElementById('sorttable_sortfwdind');
- if (sortfwdind) { sortfwdind.parentNode.removeChild(sortfwdind); }
- sortrevind = document.getElementById('sorttable_sortrevind');
- if (sortrevind) { sortrevind.parentNode.removeChild(sortrevind); }
-
- this.className += ' sorttable_sorted';
- sortfwdind = document.createElement('span');
- sortfwdind.id = "sorttable_sortfwdind";
- sortfwdind.innerHTML = stIsIE ? '&nbsp<font face="webdings">6</font>' : '&nbsp;&#x25BE;';
- this.appendChild(sortfwdind);
-
- // build an array to sort. This is a Schwartzian transform thing,
- // i.e., we "decorate" each row with the actual sort key,
- // sort based on the sort keys, and then put the rows back in order
- // which is a lot faster because you only do getInnerText once per row
- row_array = [];
- col = this.sorttable_columnindex;
- rows = this.sorttable_tbody.rows;
- for (var j=0; j<rows.length; j++) {
- row_array[row_array.length] = [sorttable.getInnerText(rows[j].cells[col]), rows[j]];
- }
- /* If you want a stable sort, uncomment the following line */
- //sorttable.shaker_sort(row_array, this.sorttable_sortfunction);
- /* and comment out this one */
- row_array.sort(this.sorttable_sortfunction);
-
- tb = this.sorttable_tbody;
- for (var j=0; j<row_array.length; j++) {
- tb.appendChild(row_array[j][1]);
- }
-
- delete row_array;
- });
- }
- }
- },
-
- guessType: function(table, column) {
- // guess the type of a column based on its first non-blank row
- sortfn = sorttable.sort_alpha;
- for (var i=0; i<table.tBodies[0].rows.length; i++) {
- text = sorttable.getInnerText(table.tBodies[0].rows[i].cells[column]);
- if (text != '') {
- if (text.match(/^-?[£$¤]?[\d,.]+%?$/)) {
- return sorttable.sort_numeric;
- }
- // check for a date: dd/mm/yyyy or dd/mm/yy
- // can have / or . or - as separator
- // can be mm/dd as well
- possdate = text.match(sorttable.DATE_RE)
- if (possdate) {
- // looks like a date
- first = parseInt(possdate[1]);
- second = parseInt(possdate[2]);
- if (first > 12) {
- // definitely dd/mm
- return sorttable.sort_ddmm;
- } else if (second > 12) {
- return sorttable.sort_mmdd;
- } else {
- // looks like a date, but we can't tell which, so assume
- // that it's dd/mm (English imperialism!) and keep looking
- sortfn = sorttable.sort_ddmm;
- }
- }
- }
- }
- return sortfn;
- },
-
- getInnerText: function(node) {
- // gets the text we want to use for sorting for a cell.
- // strips leading and trailing whitespace.
- // this is *not* a generic getInnerText function; it's special to sorttable.
- // for example, you can override the cell text with a customkey attribute.
- // it also gets .value for <input> fields.
-
- if (!node) return "";
-
- hasInputs = (typeof node.getElementsByTagName == 'function') &&
- node.getElementsByTagName('input').length;
-
- if (node.getAttribute("sorttable_customkey") != null) {
- return node.getAttribute("sorttable_customkey");
- }
- else if (typeof node.textContent != 'undefined' && !hasInputs) {
- return node.textContent.replace(/^\s+|\s+$/g, '');
- }
- else if (typeof node.innerText != 'undefined' && !hasInputs) {
- return node.innerText.replace(/^\s+|\s+$/g, '');
- }
- else if (typeof node.text != 'undefined' && !hasInputs) {
- return node.text.replace(/^\s+|\s+$/g, '');
- }
- else {
- switch (node.nodeType) {
- case 3:
- if (node.nodeName.toLowerCase() == 'input') {
- return node.value.replace(/^\s+|\s+$/g, '');
- }
- case 4:
- return node.nodeValue.replace(/^\s+|\s+$/g, '');
- break;
- case 1:
- case 11:
- var innerText = '';
- for (var i = 0; i < node.childNodes.length; i++) {
- innerText += sorttable.getInnerText(node.childNodes[i]);
- }
- return innerText.replace(/^\s+|\s+$/g, '');
- break;
- default:
- return '';
- }
- }
- },
-
- reverse: function(tbody) {
- // reverse the rows in a tbody
- newrows = [];
- for (var i=0; i<tbody.rows.length; i++) {
- newrows[newrows.length] = tbody.rows[i];
- }
- for (var i=newrows.length-1; i>=0; i--) {
- tbody.appendChild(newrows[i]);
- }
- delete newrows;
- },
-
- /* sort functions
- each sort function takes two parameters, a and b
- you are comparing a[0] and b[0] */
- sort_numeric: function(a,b) {
- aa = parseFloat(a[0].replace(/[^0-9.-]/g,''));
- if (isNaN(aa)) aa = 0;
- bb = parseFloat(b[0].replace(/[^0-9.-]/g,''));
- if (isNaN(bb)) bb = 0;
- return aa-bb;
- },
- sort_alpha: function(a,b) {
- if (a[0]==b[0]) return 0;
- if (a[0]<b[0]) return -1;
- return 1;
- },
- sort_ddmm: function(a,b) {
- mtch = a[0].match(sorttable.DATE_RE);
- y = mtch[3]; m = mtch[2]; d = mtch[1];
- if (m.length == 1) m = '0'+m;
- if (d.length == 1) d = '0'+d;
- dt1 = y+m+d;
- mtch = b[0].match(sorttable.DATE_RE);
- y = mtch[3]; m = mtch[2]; d = mtch[1];
- if (m.length == 1) m = '0'+m;
- if (d.length == 1) d = '0'+d;
- dt2 = y+m+d;
- if (dt1==dt2) return 0;
- if (dt1<dt2) return -1;
- return 1;
- },
- sort_mmdd: function(a,b) {
- mtch = a[0].match(sorttable.DATE_RE);
- y = mtch[3]; d = mtch[2]; m = mtch[1];
- if (m.length == 1) m = '0'+m;
- if (d.length == 1) d = '0'+d;
- dt1 = y+m+d;
- mtch = b[0].match(sorttable.DATE_RE);
- y = mtch[3]; d = mtch[2]; m = mtch[1];
- if (m.length == 1) m = '0'+m;
- if (d.length == 1) d = '0'+d;
- dt2 = y+m+d;
- if (dt1==dt2) return 0;
- if (dt1<dt2) return -1;
- return 1;
- },
-
- shaker_sort: function(list, comp_func) {
- // A stable sort function to allow multi-level sorting of data
- // see: http://en.wikipedia.org/wiki/Cocktail_sort
- // thanks to Joseph Nahmias
- var b = 0;
- var t = list.length - 1;
- var swap = true;
-
- while(swap) {
- swap = false;
- for(var i = b; i < t; ++i) {
- if ( comp_func(list[i], list[i+1]) > 0 ) {
- var q = list[i]; list[i] = list[i+1]; list[i+1] = q;
- swap = true;
- }
- } // for
- t--;
-
- if (!swap) break;
-
- for(var i = t; i > b; --i) {
- if ( comp_func(list[i], list[i-1]) < 0 ) {
- var q = list[i]; list[i] = list[i-1]; list[i-1] = q;
- swap = true;
- }
- } // for
- b++;
-
- } // while(swap)
- }
-}
-
-/* ******************************************************************
- Supporting functions: bundled here to avoid depending on a library
- ****************************************************************** */
-
-// Dean Edwards/Matthias Miller/John Resig
-
-/* for Mozilla/Opera9 */
-if (document.addEventListener) {
- document.addEventListener("DOMContentLoaded", sorttable.init, false);
-}
-
-/* for Internet Explorer */
-/*@cc_on @*/
-/*@if (@_win32)
- document.write("<script id=__ie_onload defer src=javascript:void(0)><\/script>");
- var script = document.getElementById("__ie_onload");
- script.onreadystatechange = function() {
- if (this.readyState == "complete") {
- sorttable.init(); // call the onload handler
- }
- };
-/*@end @*/
-
-/* for Safari */
-if (/WebKit/i.test(navigator.userAgent)) { // sniff
- var _timer = setInterval(function() {
- if (/loaded|complete/.test(document.readyState)) {
- sorttable.init(); // call the onload handler
- }
- }, 10);
-}
-
-/* for other browsers */
-window.onload = sorttable.init;
-
-// written by Dean Edwards, 2005
-// with input from Tino Zijdel, Matthias Miller, Diego Perini
-
-// http://dean.edwards.name/weblog/2005/10/add-event/
-
-function dean_addEvent(element, type, handler) {
- if (element.addEventListener) {
- element.addEventListener(type, handler, false);
- } else {
- // assign each event handler a unique ID
- if (!handler.$$guid) handler.$$guid = dean_addEvent.guid++;
- // create a hash table of event types for the element
- if (!element.events) element.events = {};
- // create a hash table of event handlers for each element/event pair
- var handlers = element.events[type];
- if (!handlers) {
- handlers = element.events[type] = {};
- // store the existing event handler (if there is one)
- if (element["on" + type]) {
- handlers[0] = element["on" + type];
- }
- }
- // store the event handler in the hash table
- handlers[handler.$$guid] = handler;
- // assign a global event handler to do all the work
- element["on" + type] = handleEvent;
- }
-};
-// a counter used to create unique IDs
-dean_addEvent.guid = 1;
-
-function removeEvent(element, type, handler) {
- if (element.removeEventListener) {
- element.removeEventListener(type, handler, false);
- } else {
- // delete the event handler from the hash table
- if (element.events && element.events[type]) {
- delete element.events[type][handler.$$guid];
- }
- }
-};
-
-function handleEvent(event) {
- var returnValue = true;
- // grab the event object (IE uses a global event object)
- event = event || fixEvent(((this.ownerDocument || this.document || this).parentWindow || window).event);
- // get a reference to the hash table of event handlers
- var handlers = this.events[event.type];
- // execute each event handler
- for (var i in handlers) {
- this.$$handleEvent = handlers[i];
- if (this.$$handleEvent(event) === false) {
- returnValue = false;
- }
- }
- return returnValue;
-};
-
-function fixEvent(event) {
- // add W3C standard event methods
- event.preventDefault = fixEvent.preventDefault;
- event.stopPropagation = fixEvent.stopPropagation;
- return event;
-};
-fixEvent.preventDefault = function() {
- this.returnValue = false;
-};
-fixEvent.stopPropagation = function() {
- this.cancelBubble = true;
-}
-
-// Dean's forEach: http://dean.edwards.name/base/forEach.js
-/*
- forEach, version 1.0
- Copyright 2006, Dean Edwards
- License: http://www.opensource.org/licenses/mit-license.php
-*/
-
-// array-like enumeration
-if (!Array.forEach) { // mozilla already supports this
- Array.forEach = function(array, block, context) {
- for (var i = 0; i < array.length; i++) {
- block.call(context, array[i], i, array);
- }
- };
-}
-
-// generic enumeration
-Function.prototype.forEach = function(object, block, context) {
- for (var key in object) {
- if (typeof this.prototype[key] == "undefined") {
- block.call(context, object[key], key, object);
- }
- }
-};
-
-// character enumeration
-String.forEach = function(string, block, context) {
- Array.forEach(string.split(""), function(chr, index) {
- block.call(context, chr, index, string);
- });
-};
-
-// globally resolve forEach enumeration
-var forEach = function(object, block, context) {
- if (object) {
- var resolve = Object; // default
- if (object instanceof Function) {
- // functions have a "length" property
- resolve = Function;
- } else if (object.forEach instanceof Function) {
- // the object implements a custom forEach method so use that
- object.forEach(block, context);
- return;
- } else if (typeof object == "string") {
- // the object is a string
- resolve = String;
- } else if (typeof object.length == "number") {
- // the object is array-like
- resolve = Array;
- }
- resolve.forEach(object, block, context);
- }
-};
-
diff --git a/systemd/dashboard-httpd.service b/systemd/dashboard-httpd.service
new file mode 100644
index 0000000..17d45fa
--- /dev/null
+++ b/systemd/dashboard-httpd.service
@@ -0,0 +1,6 @@
+[Unit]
+Description=Dashboard HTTP server
+Requires=dashboard-httpd.socket
+
+[Service]
+ExecStart=/bin/sh -c '~/dashboard/bin/httpd'
diff --git a/systemd/dashboard-httpd.socket b/systemd/dashboard-httpd.socket
new file mode 100644
index 0000000..e49aac4
--- /dev/null
+++ b/systemd/dashboard-httpd.socket
@@ -0,0 +1,8 @@
+[Unit]
+Description=Dashboard HTTP server
+
+[Socket]
+ListenStream=41198
+
+[Install]
+WantedBy=sockets.target
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2025-07-03 03:50:39 +0000