Dashboard update (#16)

* Update timout work

* Add simple error comparsion between calls

* Update docker to run terminal dashboard in browser

* Small corrections and fixes

Author: LinMAD

Dockerfile

@@ -1,14 +1,37 @@
-FROM golang:1.10-alpine
+FROM golang:1.12-stretch
 
-LABEL description="Image to compile project from container"
+LABEL description="Image to execute BitAccretion in web"
+ENV GO111MODULE=off
 
-# Create working paths
+# Install deps
+RUN apt-get -y update && apt-get install -y \
+    ca-certificates \
+    make \
+    libasound2 \
+    libasound2-dev \
+    curl \
+    tar
+
+# Install gotty for web terminal
+# TODO Remove hardocded gotty version
+RUN curl -sLk https://github.com/yudai/gotty/releases/download/v2.0.0-alpha.3/gotty_2.0.0-alpha.3_linux_amd64.tar.gz | tar xzC /opt && \
+    chmod  +x /opt/gotty && \
+    chmod 744 /opt/gotty && \
+    mv /opt/gotty /usr/local/bin/
+
+RUN apt-get purge --auto-remove -y && apt-get clean && rm -rf /var/lib/apt/lists*
+
+# Setup application paths
 RUN mkdir -p /go/src/github.com/LinMAD/BitAccretion
+COPY ./. /go/src/github.com/LinMAD/BitAccretion
 WORKDIR /go/src/github.com/LinMAD/BitAccretion
 
-# Install dependecies
-RUN apk update && apk add --update \
-    build-base make \
-    git \
-    nodejs nodejs-npm \
-    alsa-lib-dev
+# Compile it
+# TODO Remove hardcoded provider plugin
+RUN go build -o ./build/BitAccretion main.go && make plugin_relic && make plugin_sound
+COPY config.json build/config.json
+WORKDIR build
+
+# Execute
+EXPOSE 8080
+CMD gotty --reconnect ./BitAccretion

core/kernel.go

@@ -64,7 +64,13 @@ func (k *Kernel) initDashboard(t terminalapi.Terminal) error {
 
 	log.Println("Creating terminal dashboard UI...")
 	var dErr error
-	k.d, dErr = dashboard.NewMonitoringDashboard("BitAccretion", k.c, k.s, t, g)
+	k.d, dErr = dashboard.NewMonitoringDashboard(
+		fmt.Sprintf("BitAccretion:%s - [%s]", k.p.GetDescription().Name, k.p.GetDescription().MetricsDescription),
+		k.c,
+		k.s,
+		t,
+		g,
+	)
 	if dErr != nil {
 		return dErr
 	}
@@ -89,7 +95,7 @@ func (k *Kernel) dashboardUpdate(ctx context.Context, delay time.Duration) {
 			}
 
 			isNeedToFetch = false
-			k.l.Normal("Requesting provider to get new data update...")
+			k.l.Normal(fmt.Sprintf("Requesting provider (%s) to get new data update...", k.p.GetDescription().Name))
 
 			providerGraph, providerGraphErr := k.p.FetchNewData(k.l)
 			if providerGraphErr != nil {
@@ -133,6 +139,7 @@ func (k *Kernel) Run(t terminalapi.Terminal) error {
 
 	fmt.Print("\033[H\033[2J") // Clean terminal screen from any artifacts
 
+	k.l.Normal("Dashboard ready and preparing to collect data...")
 	termErr := termdash.Run(
 		ctx,
 		t,

dashboard/dashboard.go

@@ -26,6 +26,7 @@ type widgets struct {
 	reqAggregated *SparkLineWidgetHandler
 	eventLog      *AnnouncerHandler
 	clock         *ClockWidgetHandler
+	regression    *GaugeRegressHandler
 }
 
 // HandleNotifyEvent send update to monitoring dashboard
@@ -61,7 +62,8 @@ func (m *MonitoringDashboard) initWidgets(s extension.ISound, c *model.Config, n
 	if err != nil {
 		return err
 	}
-	m.widgetCollection.clock, err = NewClockWidget()
+
+	m.widgetCollection.regression, err = NewRegressionWidget("Regression level of errors", c)
 	if err != nil {
 		return err
 	}
@@ -73,7 +75,7 @@ func (m *MonitoringDashboard) initWidgets(s extension.ISound, c *model.Config, n
 func (m *MonitoringDashboard) createLayout(dashboardName string, t *terminalapi.Terminal) (err error) {
 	m.TerminalContainer, err = container.New(
 		*t,
-		container.Border(linestyle.Double),
+		container.Border(linestyle.Light),
 		container.BorderTitle(dashboardName),
 		container.SplitHorizontal(
 			container.Top(
@@ -82,10 +84,10 @@ func (m *MonitoringDashboard) createLayout(dashboardName string, t *terminalapi.
 						container.SplitHorizontal(
 							container.Top(
 								container.Border(linestyle.Round),
-								container.PlaceWidget(m.widgetCollection.clock.sdClock),
+								container.PlaceWidget(m.widgetCollection.regression.gauge),
 							),
 							container.Bottom(
-								container.Border(linestyle.Double),
+								container.Border(linestyle.Round),
 								container.BorderTitle("Event log"),
 								container.PlaceWidget(m.widgetCollection.eventLog.t),
 							),
@@ -143,6 +145,7 @@ func NewMonitoringDashboard(dashboardName string, c *model.Config, s extension.I
 	termDash.observer.RegisterNewSubscriber(termDash.widgetCollection.reqIncorrect)
 	termDash.observer.RegisterNewSubscriber(termDash.widgetCollection.reqAggregated)
 	termDash.observer.RegisterNewSubscriber(termDash.widgetCollection.eventLog)
+	termDash.observer.RegisterNewSubscriber(termDash.widgetCollection.regression)
 
 	return termDash, nil
 }

dashboard/log.go

@@ -23,19 +23,21 @@ func (l *loggerHandler) SetMode(level logger.LevelOfLog) {
 
 // Debug messages
 func (l *loggerHandler) Debug(msg string) {
-	if l.lvl == logger.DebugLog {
+	if l.lvl <= logger.DebugLog {
 		l.widget.WriteToEventLog("Debug: "+msg, cell.ColorWhite)
 	}
 }
 
 // Normal events messages
 func (l *loggerHandler) Normal(msg string) {
-	l.widget.WriteToEventLog(msg, cell.ColorWhite)
+	if l.lvl < logger.ErrorLog {
+		l.widget.WriteToEventLog(msg, cell.ColorWhite)
+	}
 }
 
 // Error events messages
 func (l *loggerHandler) Error(msg string) {
-	if l.lvl == logger.ErrorLog {
+	if l.lvl <= logger.ErrorLog {
 		l.widget.WriteToEventLog(msg, cell.ColorRed)
 	}
 }

dashboard/regression.go

@@ -0,0 +1,77 @@
+package dashboard
+
+import (
+	"github.com/LinMAD/BitAccretion/event"
+	"github.com/LinMAD/BitAccretion/model"
+	"github.com/mum4k/termdash/cell"
+	"github.com/mum4k/termdash/linestyle"
+	"github.com/mum4k/termdash/widgets/gauge"
+)
+
+// GaugeRegressHandler for dashboard
+type GaugeRegressHandler struct {
+	name   string
+	gauge  *gauge.Gauge
+	config *model.Config
+	// currentRatio showing regression of errors
+	currentRatio int
+	prevErrCount int
+}
+
+// HandleNotifyEvent update of gauge regression process
+func (g *GaugeRegressHandler) HandleNotifyEvent(e event.UpdateEvent) error {
+	if err := g.gauge.Percent(g.currentRatio); err != nil {
+		panic(err)
+	}
+
+	var newErrCount int
+	vertices := e.MonitoringGraph.GetAllVertices()
+	l := len(vertices)
+
+	for i := 0; i < l; i++ {
+		newErrCount += int(vertices[i].Metric.ErrorCount)
+	}
+
+	// TODO Think about longer compactions maybe between hours or weeks
+	if newErrCount == 0 {
+		g.currentRatio = 0
+		g.prevErrCount = 0
+	} else {
+		g.currentRatio = +(newErrCount - g.prevErrCount)
+		if g.currentRatio > 100 {
+			g.currentRatio = 100
+		} else if g.currentRatio < 0 {
+			g.currentRatio = 0
+		}
+	}
+
+	g.prevErrCount = newErrCount
+
+	return nil
+}
+
+// GetName of widget handler
+func (g *GaugeRegressHandler) GetName() string {
+	return g.name
+}
+
+// NewRegressionWidget create and return prepared widget, shows % of ok/err requests as regression
+func NewRegressionWidget(name string, c *model.Config) (*GaugeRegressHandler, error) {
+	g, err := gauge.New(
+		gauge.Height(2),
+		gauge.Color(cell.ColorRed),
+		gauge.Border(linestyle.Light, cell.FgColor(cell.ColorYellow)),
+		gauge.BorderTitle(name),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	widget := &GaugeRegressHandler{
+		name:   name,
+		gauge:  g,
+		config: c,
+	}
+
+	return widget, nil
+}

docker.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+build() {
+  docker build -t web_bit_accretion .
+}
+
+# ARG - 1 port
+execute() {
+  docker run -it --rm -p "80:8080" --device /dev/snd:/dev/snd --network host --name web_bit_accretion web_bit_accretion
+}
+
+### MAIN
+build
+execute "$1"

extension/fake/provider.go

@@ -11,6 +11,7 @@ import (
 // FakeProvider randomly generates dummy data
 type FakeProvider struct {
 	pluginHealth model.HealthState
+	pluginInfo   model.ProviderDescription
 }
 
 // LoadConfig stub
@@ -40,9 +41,20 @@ func (f *FakeProvider) ProvideHealth() model.HealthState {
 	return f.pluginHealth
 }
 
+// GetDescription of provider
+func (f *FakeProvider) GetDescription() model.ProviderDescription {
+	return f.pluginInfo
+}
+
 // NewProvider implementation
 func NewProvider() extension.IProvider {
-	return &FakeProvider{pluginHealth: model.HealthNormal}
+	return &FakeProvider{
+		pluginHealth: model.HealthNormal,
+		pluginInfo: model.ProviderDescription{
+			Name:               "Fake provider",
+			MetricsDescription: "Random generated data",
+		},
+	}
 }
 
 // GetStubNodes generated dummy nodes with data

extension/newrelic/provider.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"os"
@@ -50,6 +49,8 @@ type ProviderNewRelic struct {
 	worker *worker.RelicWorker
 	// pluginHealth current state of extension
 	pluginHealth model.HealthState
+	// pluginIfo short info of new relic provider
+	pluginInfo model.ProviderDescription
 }
 
 // LoadConfig of new relic extension
@@ -93,31 +94,23 @@ func (nr *ProviderNewRelic) DispatchGraph() (model.Graph, error) {
 // FetchNewData returns latest assembled graph
 func (nr *ProviderNewRelic) FetchNewData(log logger.ILogger) (model.Graph, error) {
 	g := nr.prepareGraph()
+	timeout := time.After(time.Duration(nr.Config.SurveyIntervalSec*2+1) * time.Second)
+	isProcessed := make(chan bool, 1)
 
-	log.Debug(fmt.Sprintf("Harvesting data from NewRelic API..."))
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	// Get info from API with timeout
-	ticker := time.NewTicker(time.Duration(nr.Config.SurveyIntervalSec*2+1) * time.Second)
-	defer ticker.Stop()
-	isExecuted := false // all only one coroutine
+	go func(g *model.Graph) {
+		log.Debug(fmt.Sprintf("Harvesting data from NewRelic API..."))
+		nr.fetchMetricsWithGraph(g, log)
+		isProcessed <- true
+	}(g)
 
 	for {
 		select {
-		default:
-			if isExecuted {
-				continue
-			}
-
-			isExecuted = true
-			go func(g *model.Graph) {
-				defer cancel()
-				nr.fetchMetricsWithGraph(g, log)
-			}(g)
-		case <-ticker.C:
-			cancel()
-		case <-ctx.Done():
+		case <-isProcessed:
+			nr.pluginHealth = model.HealthNormal
+			return *g, nil
+		case <-timeout:
+			log.Error("Timeout got from NewRelic provider...")
+			nr.pluginHealth = model.HealthWarning
 			return *g, nil
 		}
 	}
@@ -128,6 +121,11 @@ func (nr *ProviderNewRelic) ProvideHealth() model.HealthState {
 	return nr.pluginHealth
 }
 
+// GetDescription of provider
+func (nr *ProviderNewRelic) GetDescription() model.ProviderDescription {
+	return nr.pluginInfo
+}
+
 // fetchMetricsWithGraph from API and put in to graph
 func (nr *ProviderNewRelic) fetchMetricsWithGraph(g *model.Graph, log logger.ILogger) {
 	appList := g.GetAllVertices()
@@ -191,5 +189,11 @@ func (nr *ProviderNewRelic) prepareGraph() (g *model.Graph) {
 
 // NewProvider returns instance with implemented interface
 func NewProvider() extension.IProvider {
-	return &ProviderNewRelic{pluginHealth: model.HealthNormal}
+	return &ProviderNewRelic{
+		pluginHealth: model.HealthNormal,
+		pluginInfo: model.ProviderDescription{
+			Name:               "New Relic API",
+			MetricsDescription: "Requests per minute",
+		},
+	}
 }

extension/provider.go

@@ -19,4 +19,6 @@ type IProvider interface {
 	// ProvideHealth must provide if extension still can work
 	// example API not reachable or extension has errors and it must be restarted
 	ProvideHealth() model.HealthState
+	// GetDescription of implemented provider
+	GetDescription() model.ProviderDescription
 }

main.go

@@ -1,13 +1,17 @@
 package main
 
 import (
+	"runtime"
+
 	"github.com/LinMAD/BitAccretion/core"
 	"github.com/LinMAD/BitAccretion/extension"
 	"github.com/LinMAD/BitAccretion/model"
 	"github.com/mum4k/termdash/terminal/termbox"
 )
 
 func main() {
+	runtime.GOMAXPROCS(runtime.NumCPU())
+
 	t, err := termbox.New()
 	if err != nil {
 		panic(err)