convert to go.mod, to avoid broken dependancy

jaw0 · Mar 17, 2022 · 57c81c9 · 57c81c9
1 parent bc67d6a
commit 57c81c9
Show file tree

Hide file tree

Showing 84 changed files with 436 additions and 290 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,7 @@ bin/argusd
 src/github.com/
 src/golang.org/
 src/.deps
+src/argus/argus/version.go
+src/argus/argus/ctlsock.go
+pkg/mod
+pkg/sumdb
diff --git a/Makefile b/Makefile
@@ -33,11 +33,7 @@ all: src/.deps
 	@echo now run \'make install\'
 
 src/.deps: deps
-	@echo fetching dependencies...
-	@for d in `cat deps`; do \
-		echo + $$d; \
-		$(GO) get -insecure $$d; \
-	done
+	cd src ; go mod download
 	@touch src/.deps
 
 install: all

diff --git a/htdir/static/chartstrip.js b/htdir/static/chartstrip.js
@@ -53,6 +53,7 @@ function ChartStrip(el, opts){
         var opts = {}
         var i
         // merge user supplied opts with defaults, above
+        opts.scale_func = this.Linear
         var k = Object.keys(this.defaults)
         for(i=0; i<k.length; i++){
             opts[ k[i] ] = this.defaults[ k[i] ]
@@ -131,16 +132,18 @@ function ChartStrip(el, opts){
     //   -- Thoreau, Inspiration
 
     p.analyze = function(dataset){
-        var xmin, xmax, ymin, ymax
-        var i, p, left, right, dxl, dxr, dyl, dyr, dl, dr
+        var xmin, xmax, ymin, ymax, ylmin, ylmax
+        var i, p, v, left, right, dxl, dxr, dyl, dyr, dl, dr
         var dydx = []
 
         var data = dataset.data
+        var dfunc = dataset.opts.data_func
+        var sfunc = this.opts.scale_func
 
         if( !data ) return
 
         for(i=0;  i<data.length; i++){
-            p = dataset.opts.data_func( data[i] )
+            p = dfunc( data[i] )
             if( !p ) continue
 
             if( typeof(xmin) == 'undefined' ) xmin = p.Time
@@ -149,26 +152,39 @@ function ChartStrip(el, opts){
             //console.log("analyze: " + i + ": " + p.Time + " " + p.Value )
 
             if( dataset.opts.type == 'range' ){
+                var vi = sfunc(p.Min)
+                var va = sfunc(p.Max)
+
                 if( i == 0 ){
-                    ymin = p.Min
-                    ymax = p.Max
+                    ylmin = p.Min
+                    ylmax = p.Max
+                    ymin  = vi
+                    ymax  = va
                 }
-                if( p.Min < ymin ) ymin = p.Min
-                if( p.Max > ymax ) ymax = p.Max
+                if( p.Min < ylmin ) ylmin = p.Min
+                if( p.Max > ylmax ) ylmax = p.Max
+                if( vi < ymin )  ymin  = vi
+                if( va > ymax )  ymax  = va
             }
             if( dataset.opts.type == 'line' ){
-                if( i == 0 ) ymin = ymax = p.Value
-                if( p.Value < ymin ) ymin = p.Value
-                if( p.Value > ymax ) ymax = p.Value
+                v = sfunc(p.Value)
+                if( i == 0 ){
+                    ylmin = ylmax = p.Value
+                    ymin  = ymax  = v
+                }
+                if( p.Value < ylmin ) ylmin = p.Value
+                if( p.Value > ylmax ) ylmax = p.Value
+                if( v < ymin ) ymin = v
+                if( v > ymax ) ymax = v
 
                 // calc derivative
-                left  = (i==0) ? p : dataset.opts.data_func( data[i-1] )
-                right = (i==data.length-1) ? p : dataset.opts.data_func( data[i+1] )
+                left  = (i==0) ? p : dfunc( data[i-1] )
+                right = (i==data.length-1) ? p : dfunc( data[i+1] )
 
                 dxl = p.Time - left.Time
                 dxr = right.Time - p.Time
-                dyl = p.Value - left.Value
-                dyr = right.Value - p.Value
+                dyl = v - sfunc(left.Value)
+                dyr = sfunc(right.Value) - v
 
                 if( dxl && dxr ){
                     dl = dyl / dxl
@@ -197,13 +213,15 @@ function ChartStrip(el, opts){
         }
         dataset.yd_min = ymin
         dataset.yd_max = ymax
+        dataset.yl_min = ylmin
+        dataset.yl_max = ylmax
         dataset.xd_min = xmin
         dataset.xd_max = xmax
         dataset.dydx   = dydx
     }
 
     p.adjust = function(sets){
-        var xmin, xmax, ymin, ymax
+        var xmin, xmax, ymin, ymax, ylmin, ylmax
         var i,s
 
         // determine min/max from selected datasets
@@ -215,18 +233,24 @@ function ChartStrip(el, opts){
                 xmax = s.xd_max
                 ymin = s.yd_min
                 ymax = s.yd_max
+                ylmin = s.yl_min
+                ylmax = s.yl_max
             }
 
             if( s.xd_min < xmin ) xmin = s.xd_min
             if( s.xd_max > xmax ) xmax = s.xd_max
             if( s.yd_min < ymin ) ymin = s.yd_min
             if( s.yd_max > ymax ) ymax = s.yd_max
+            if( s.yl_min < ylmin ) ylmin = s.yl_min
+            if( s.yl_max > ylmax ) ylmax = s.yl_max
         }
 
         this.xd_min = xmin
         this.xd_max = xmax
         this.yd_min = ymin
         this.yd_max = ymax
+        this.yl_min = ylmin
+        this.yl_max = ylmax
     }
 
     p.setScale = function(){
@@ -383,6 +407,9 @@ function ChartStrip(el, opts){
         }
     }
 
+    p.Linear = function(v){
+        return v
+    }
     p.AsIs = function(p){
         return p
     }
@@ -398,10 +425,11 @@ function ChartStrip(el, opts){
         var color = set.opts.color
         var dfunc = set.opts.data_func
         var cfunc = set.opts.color_func
+        var sfunc = this.opts.scale_func
         var limit = this.opts.limit_factor * (this.xd_max - this.xd_min) / data.length
         var smooth = set.opts.smooth ? set.opts.smooth_factor || this.opts.smooth_factor : 0
         var prevcolor
-        var i, c, p, pp, gap
+        var i, c, p, pp, gap, v
         var dxt, cx0, cx1, xy0, cy1
 
         C.save()
@@ -423,6 +451,7 @@ function ChartStrip(el, opts){
             p = dfunc( data[i] )
             if( !p ) continue
             c = cfunc( data[i], color )
+            v = sfunc(p.Value)
 
             gap = ( pp && limit && (p.Time - pp.Time) > limit )
             if( gap )  pp = undefined
@@ -436,19 +465,19 @@ function ChartStrip(el, opts){
                     dxt = (p.Time - pp.Time) / (smooth * 3)
                     cx0 = pp.Time + dxt
                     cx1 = p.Time  - dxt
-                    cy0 = pp.Value + dydx[i-1] * dxt
-                    cy1 = p.Value  - dydx[i] * dxt
+                    cy0 = sfunc(pp.Value) + dydx[i-1] * dxt
+                    cy1 = v  - dydx[i] * dxt
 
-                    C.bezierCurveTo(this.dx(cx0), this.dy(cy0), this.dx(cx1), this.dy(cy1), this.dx(p.Time), this.dy(p.Value))
+                    C.bezierCurveTo(this.dx(cx0), this.dy(cy0), this.dx(cx1), this.dy(cy1), this.dx(p.Time), this.dy(v))
                 }else{
-                    C.lineTo( this.dx(p.Time), this.dy(p.Value) )
+                    C.lineTo( this.dx(p.Time), this.dy(v) )
                 }
             }
             if( (c != prevcolor) || !pp ){
                 C.stroke()
                 C.beginPath()
                 C.strokeStyle = c
-                C.moveTo( this.dx(p.Time), this.dy(p.Value) )
+                C.moveTo( this.dx(p.Time), this.dy(v) )
             }
 
             prevcolor = c
@@ -458,7 +487,7 @@ function ChartStrip(el, opts){
         C.restore()
     }
 
-
+// RSN - scale_func
     p.plot_range = function(set){
         var C = this.C
         var data = set.data
@@ -550,8 +579,8 @@ function ChartStrip(el, opts){
     }
 
     p.determineYtics = function(){
-        var min = this.yd_min
-        var max = this.yd_max
+        var min = this.yl_min
+        var max = this.yl_max
         var maxw = 0
         var lb, w, tp, is, st, low, i, y
         var tics = []
@@ -563,7 +592,7 @@ function ChartStrip(el, opts){
             // not a very interesting graph...
             lb = this.pretty(min, 1)
             w = this.C.measureText(lb).width
-            tics.push( { y: min, label: lb, width: w, height: ht } )
+            tics.push( { y: this.opts.scale_func(min), label: lb, width: w, height: ht } )
             maxw = w
         }else{
             tp = (max - min) / this.opts.n_y_tics // approx spacing of tics
@@ -584,7 +613,7 @@ function ChartStrip(el, opts){
                 lb = this.pretty(y, st)
                 w = this.C.measureText(lb).width
                 if( w > maxw ) maxw = w
-                tics.push( {y: y, label: lb, width: w, height: ht} )
+                tics.push( {y: this.opts.scale_func(y), label: lb, width: w, height: ht} )
             }
         }
 

diff --git a/src/argus/agent/agent.go b/src/argus/agent/agent.go
@@ -16,8 +16,8 @@ import (
 	"syscall"
 	"time"
 
-	"argus/api"
-	"argus/service"
+	"argus.domain/argus/api"
+	"argus.domain/argus/service"
 	"github.com/jaw0/acgo/diag"
 )
 

diff --git a/src/argus/alias/alias.go b/src/argus/alias/alias.go
@@ -8,9 +8,9 @@ package alias
 import (
 	"errors"
 
-	"argus/argus"
-	"argus/configure"
-	"argus/monel"
+	"argus.domain/argus/argus"
+	"argus.domain/argus/configure"
+	"argus.domain/argus/monel"
 	"github.com/jaw0/acgo/diag"
 )
 

diff --git a/src/argus/api/client/auth.go b/src/argus/api/client/auth.go
@@ -11,7 +11,7 @@ import (
 	"fmt"
 	"time"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 )
 
 type Creds struct {

diff --git a/src/argus/api/client/client.go b/src/argus/api/client/client.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 )
 
 type Conn struct {
@@ -91,7 +91,7 @@ func (c *Conn) Get(method string, args map[string]string, timeout time.Duration)
 	if err != nil {
 		return nil, err
 	}
-	// parse response "argus/5.0 200 ok"
+	// parse response "argus.domain/argus/5.0 200 ok"
 	flds := strings.SplitN(string(respline), " ", 3)
 	if len(flds) != 3 {
 		return nil, fmt.Errorf("protocol botched")

diff --git a/src/argus/api/server.go b/src/argus/api/server.go
@@ -14,8 +14,8 @@ import (
 	"os"
 	"strings"
 
-	"argus/argus"
-	"argus/config"
+	"argus.domain/argus/argus"
+	"argus.domain/argus/config"
 )
 
 const (

diff --git a/src/argus/config/config.go b/src/argus/config/config.go
@@ -11,7 +11,7 @@ import (
 	"github.com/jaw0/acgo/accfg"
 	"github.com/jaw0/acgo/diag"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 )
 
 type Config struct {

diff --git a/src/argus/configure/configure.go b/src/argus/configure/configure.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 	"github.com/jaw0/acgo/diag"
 )
 

diff --git a/src/argus/configure/configure_test.go b/src/argus/configure/configure_test.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 	"github.com/jaw0/acgo/diag"
 )
 

diff --git a/src/argus/construct/make.go b/src/argus/construct/make.go
@@ -6,16 +6,16 @@
 package construct
 
 import (
-	"argus/configure"
+	"argus.domain/argus/configure"
 	//"github.com/jaw0/acgo/diag"
-	"argus/alias"
-	"argus/darp"
-	"argus/group"
-	"argus/monel"
-	"argus/monitor/agent"
-	"argus/monitor/snmp"
-	"argus/notify"
-	"argus/service"
+	"argus.domain/argus/alias"
+	"argus.domain/argus/darp"
+	"argus.domain/argus/group"
+	"argus.domain/argus/monel"
+	"argus.domain/argus/monitor/agent"
+	"argus.domain/argus/monitor/snmp"
+	"argus.domain/argus/notify"
+	"argus.domain/argus/service"
 )
 
 func Make(cf *configure.CF, parent *monel.M) *monel.M {

diff --git a/src/argus/construct/readconfig.go b/src/argus/construct/readconfig.go
@@ -8,13 +8,13 @@ package construct
 import (
 	"strings"
 
-	"argus/argus"
-	"argus/configure"
+	"argus.domain/argus/argus"
+	"argus.domain/argus/configure"
 	"github.com/jaw0/acgo/diag"
-	"argus/monel"
-	"argus/notify"
-	"argus/service"
-	"argus/web"
+	"argus.domain/argus/monel"
+	"argus.domain/argus/notify"
+	"argus.domain/argus/service"
+	"argus.domain/argus/web"
 )
 
 type readConf struct {

diff --git a/src/argus/construct/reader.go b/src/argus/construct/reader.go
@@ -14,7 +14,7 @@ import (
 	"strconv"
 	"strings"
 
-	"argus/argus"
+	"argus.domain/argus/argus"
 )
 
 type openfile struct {

diff --git a/src/argus/construct/schedule.go b/src/argus/construct/schedule.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"strings"
 
-	"argus/argus"
-	"argus/configure"
+	"argus.domain/argus/argus"
+	"argus.domain/argus/configure"
 )
 
 var dayNo = map[string]int{"sun": 0, "mon": 1, "tue": 2, "wed": 3, "thu": 4, "fri": 5, "sat": 6}