Release 0.2.5

* List supported resources for scanners

* Don't warn on scanner discovery commands

* Use scanner-to-resource map

* Save changes

* Scan result tabs

* Own table render for Checkov

* Scannable manifest flag for scanners

CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-https://komodorkommunity.slack.com/archives/C044U1B0265.
+itiel@komodor.com.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

Makefile

@@ -1,9 +1,24 @@
-pull:
-	git pull
+DATE    ?= $(shell date +%FT%T%z)
+VERSION ?= $(git describe --tags --always --dirty --match=v* 2> /dev/null || \
+			cat $(CURDIR)/.version 2> /dev/null || echo "v0")
 
-build:
-	go build -o bin/dashboard .
+.PHONY: test
+test: ; $(info $(M) start unit testing...) @
+	@go test $$(go list ./... | grep -v /mocks/) --race -v -short -coverprofile=profile.cov
+	@echo "\n*****************************"
+	@echo "**  TOTAL COVERAGE: $$(go tool cover -func profile.cov | grep total | grep -Eo '[0-9]+\.[0-9]+')%  **"
+	@echo "*****************************\n"
 
+.PHONY: pull
+pull: ; $(info $(M) Pulling source...) @
+	@git pull
 
-debug:
-	 DEBUG=1 ./bin/dashboard
+.PHONY: build
+build: $(BIN) ; $(info $(M) Building executable...) @ ## Build program binary
+	$Q $(GO) build \
+		-ldflags '-X main.version=$(VERSION) -X main.buildDate=$(DATE)' \
+		-o bin/dashboard .
+
+.PHONY: debug
+debug: ; $(info $(M) Running dashboard in debug mode...) @
+	@DEBUG=1 ./bin/dashboard

README.md

@@ -1,4 +1,4 @@
-# <img src="pkg/dashboard/static/logo.png" height=30 style="height: 2rem"> Helm Dashboard
+# ![Helm Dashboard](pkg/dashboard/static/logo-header.svg)
 
 A simplified way of working with Helm.
 
@@ -42,9 +42,11 @@ To uninstall, run:
 helm plugin uninstall dashboard
 ```
 
+> In case standard Helm plugin way did not work for you, you can just download the appropriate [release package](https://github.com/komodorio/helm-dashboard/releases) for your platform, unpack it and just run `dashboard` binary from it.
+
 ## Running
 
-To use the plugin, your machine needs to have working `helm` and also `kubectl` commands.
+To use the plugin, your machine needs to have working `helm` and also `kubectl` commands. Helm version 3.4.0+ is required.
 
 After installing, start the UI by running:
 
@@ -55,14 +57,20 @@ helm dashboard
 The command above will launch the local Web server and will open the UI in new browser tab. The command will hang
 waiting for you to terminate it in command-line or web UI.
 
+You can see the list of available command-line flags by running `helm dashboard --help`.
+
 By default, the web server is only available locally. You can change that by specifying `HD_BIND` environment variable
 to the desired value. For example, `0.0.0.0` would bind to all IPv4 addresses or `[::0]` would be all IPv6 addresses.
 
-If your port 8080 is busy, you can specify a different port to use via `HD_PORT` environment variable.
+If your port 8080 is busy, you can specify a different port to use via `--port <number>` command-line flag.
 
-If you don't want browser tab to automatically open, set `HD_NOBROWSER=1` in your environment variables.
+If you need to limit the operations to a specific namespace, please use `--namespace=...` in your command-line. 
 
-If you want to increase the logging verbosity and see all the debug info, set `DEBUG=1` environment variable.
+If you don't want browser tab to automatically open, add `--no-browser` flag in your command line.
+
+If you want to increase the logging verbosity and see all the debug info, use the `--verbose` flag.
+
+> Disclaimer: For the sake of improving the project quality, there is user analytics collected by the tool. You can disable this collecting with `--no-analytics` option. The collection is done via DataDog RUM and Heap Analytics. Only the anonymous data is collected, no sensitive information is used.
 
 ## Scanner Integrations
 
@@ -80,7 +88,7 @@ button at the bottom of the dialog:
 ## Support Channels
 
 We have two main channels for supporting the Helm Dashboard
-users: [Slack community](https://komodorkommunity.slack.com/archives/C044U1B0265) for general conversations
+users: [Slack community](https://join.slack.com/t/komodorkommunity/shared_invite/zt-1dm3cnkue-ov1Yh~_95teA35QNx5yuMg) for general conversations
 and [GitHub issues](https://github.com/komodorio/helm-dashboard/issues) for real bugs.
 
 

go.mod

@@ -3,122 +3,46 @@ module github.com/komodorio/helm-dashboard
 go 1.18
 
 require (
-	github.com/aquasecurity/trivy v0.32.1
 	github.com/gin-gonic/gin v1.8.1
+	github.com/hashicorp/go-version v1.6.0
 	github.com/hexops/gotextdiff v1.0.3
+	github.com/jessevdk/go-flags v1.5.0
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/sirupsen/logrus v1.9.0
-	github.com/toqueteos/webbrowser v1.2.0
 	gopkg.in/yaml.v3 v3.0.1
 	helm.sh/helm/v3 v3.9.4
 	k8s.io/apimachinery v0.25.0-alpha.2
 )
 
 require (
-	github.com/CycloneDX/cyclonedx-go v0.6.0 // indirect
-	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
-	github.com/Masterminds/sprig/v3 v3.2.2 // indirect
-	github.com/Sirupsen/logrus v1.0.6 // indirect
-	github.com/aquasecurity/go-dep-parser v0.0.0-20220928105313-d3a51fe400e4 // indirect
-	github.com/aquasecurity/table v1.8.0 // indirect
-	github.com/aquasecurity/trivy-db v0.0.0-20220627104749-930461748b63 // indirect
-	github.com/aquasecurity/trivy-kubernetes v0.3.1-0.20220823151349-b90b48958b91 // indirect
-	github.com/caarlos0/env/v6 v6.10.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/docker/libnetwork v0.5.6 // indirect
-	github.com/emicklei/go-restful/v3 v3.8.0 // indirect
-	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
-	github.com/fatih/color v1.13.0 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-errors/errors v1.0.1 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
-	github.com/go-openapi/jsonpointer v0.19.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
 	github.com/go-playground/validator/v10 v10.11.0 // indirect
 	github.com/goccy/go-json v0.9.11 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/btree v1.0.1 // indirect
-	github.com/google/gnostic v0.5.7-v3refs // indirect
-	github.com/google/go-containerregistry v0.11.0 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
-	github.com/huandu/xstrings v1.3.2 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/in-toto/in-toto-golang v0.3.4-0.20220709202702-fa494aaa0add // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/knqyf263/go-rpm-version v0.0.0-20220614171824-631e686d1075 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/liamg/tml v0.6.0 // indirect
-	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-runewidth v0.0.13 // indirect
-	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
-	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
-	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/owenrumney/go-sarif/v2 v2.1.2 // indirect
-	github.com/package-url/packageurl-go v0.1.1-0.20220203205134-d70459300c8a // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.3 // indirect
-	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
-	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
-	github.com/samber/lo v1.27.1 // indirect
-	github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
-	github.com/shibumi/go-pathspec v1.3.0 // indirect
-	github.com/shopspring/decimal v1.2.0 // indirect
-	github.com/spdx/tools-golang v0.3.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.5.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.4.0 // indirect
-	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/ugorji/go/codec v1.2.7 // indirect
-	github.com/vishvananda/netlink v1.1.0 // indirect
-	github.com/vishvananda/netns v0.0.0-20220913150850-18c4f4234207 // indirect
-	github.com/xlab/treeprint v1.1.0 // indirect
-	go.etcd.io/bbolt v1.3.6 // indirect
-	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8 // indirect
-	golang.org/x/exp v0.0.0-20220823124025-807a23277127 // indirect
 	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
-	golang.org/x/oauth2 v0.0.0-20220718184931-c8730f7fcb92 // indirect
-	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
 	golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 // indirect
-	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
-	golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
-	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/api v0.25.0-alpha.2 // indirect
-	k8s.io/cli-runtime v0.24.4 // indirect
-	k8s.io/client-go v0.25.0-alpha.2 // indirect
 	k8s.io/klog/v2 v2.70.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
-	sigs.k8s.io/kustomize/api v0.11.4 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.13.6 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
 )

main.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
+	"github.com/jessevdk/go-flags"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard"
+	"github.com/pkg/browser"
 	log "github.com/sirupsen/logrus"
-	"github.com/toqueteos/webbrowser"
 	"os"
 )
 
@@ -14,37 +16,75 @@ var (
 	date    = "unknown"
 )
 
-func main() {
-	setupLogging()
+type options struct {
+	Version    bool `long:"version" description:"Show tool version"`
+	Verbose    bool `short:"v" long:"verbose" description:"Show verbose debug information"`
+	NoBrowser  bool `short:"b" long:"no-browser" description:"Do not attempt to open Web browser upon start"`
+	NoTracking bool `long:"no-analytics" description:"Disable user analytics (GA, DataDog etc.)"`
 
-	// TODO: proper command-line parsing
-	if len(os.Args) > 1 { // dirty thing to allow --help to work
-		os.Exit(0)
+	Port uint `short:"p" long:"port" description:"Port to start server on" default:"8080"` // TODO: better default port to clash less?
+
+	Namespace string `short:"n" long:"namespace" description:"Limit operations to a specific namespace"`
+}
+
+func main() {
+	opts := parseFlags()
+
+	setupLogging(opts.Verbose)
+
+	address, webServerDone := dashboard.StartServer(version, int(opts.Port), opts.Namespace, opts.Verbose, opts.NoTracking)
+
+	if !opts.NoTracking {
+		log.Infof("User analytics is collected to improve the quality, disable it with --no-analytics")
 	}
 
-	address, webServerDone := dashboard.StartServer(version)
-
-	if os.Getenv("HD_NOBROWSER") == "" {
+	if opts.NoBrowser {
+		log.Infof("Access web UI at: %s", address)
+	} else {
 		log.Infof("Opening web UI: %s", address)
-		err := webbrowser.Open(address)
+		err := browser.OpenURL(address)
 		if err != nil {
 			log.Warnf("Failed to open Web browser for URL: %s", err)
 		}
-	} else {
-		log.Infof("Access web UI at: %s", address)
 	}
 
 	<-webServerDone
 	log.Infof("Done.")
 }
 
-func setupLogging() {
-	if os.Getenv("DEBUG") == "" {
-		log.SetLevel(log.InfoLevel)
-		gin.SetMode(gin.ReleaseMode)
-	} else {
+func parseFlags() options {
+	opts := options{Namespace: os.Getenv("HELM_NAMESPACE")}
+	args, err := flags.Parse(&opts)
+	if err != nil {
+		if e, ok := err.(*flags.Error); ok {
+			if e.Type == flags.ErrHelp {
+				os.Exit(0)
+			}
+		}
+
+		// we rely on default behavior to print the problem inside `flags` library
+		os.Exit(1)
+	}
+
+	if opts.Version {
+		fmt.Print(version)
+		os.Exit(0)
+	}
+
+	if len(args) > 0 {
+		panic("The program does not take argumants, see --help for usage")
+	}
+	return opts
+}
+
+func setupLogging(verbose bool) {
+	if verbose {
 		log.SetLevel(log.DebugLevel)
 		gin.SetMode(gin.DebugMode)
+		log.Debugf("Debug logging is enabled")
+	} else {
+		log.SetLevel(log.InfoLevel)
+		gin.SetMode(gin.ReleaseMode)
 	}
 	log.Infof("Helm Dashboard by Komodor, version %s (%s @ %s)", version, commit, date)
 }

pkg/dashboard/api.go

@@ -2,14 +2,15 @@ package dashboard
 
 import (
 	"embed"
+	"net/http"
+	"os"
+	"path"
+
 	"github.com/gin-gonic/gin"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/handlers"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
 	log "github.com/sirupsen/logrus"
-	"net/http"
-	"os"
-	"path"
 )
 
 //go:embed static/*
@@ -44,9 +45,9 @@ func contextSetter(data *subproc.DataLayer) gin.HandlerFunc {
 	}
 }
 
-func NewRouter(abortWeb utils.ControlChan, data *subproc.DataLayer, version string) *gin.Engine {
+func NewRouter(abortWeb utils.ControlChan, data *subproc.DataLayer, debug bool) *gin.Engine {
 	var api *gin.Engine
-	if os.Getenv("DEBUG") == "" {
+	if debug {
 		api = gin.New()
 		api.Use(gin.Recovery())
 	} else {
@@ -58,12 +59,12 @@ func NewRouter(abortWeb utils.ControlChan, data *subproc.DataLayer, version stri
 	api.Use(errorHandler)
 
 	configureStatic(api)
-	configureRoutes(abortWeb, data, api, version)
+	configureRoutes(abortWeb, data, api)
 
 	return api
 }
 
-func configureRoutes(abortWeb utils.ControlChan, data *subproc.DataLayer, api *gin.Engine, version string) {
+func configureRoutes(abortWeb utils.ControlChan, data *subproc.DataLayer, api *gin.Engine) {
 	// server shutdown handler
 	api.DELETE("/", func(c *gin.Context) {
 		abortWeb <- struct{}{}
@@ -71,7 +72,8 @@ func configureRoutes(abortWeb utils.ControlChan, data *subproc.DataLayer, api *g
 	})
 
 	api.GET("/status", func(c *gin.Context) {
-		c.String(http.StatusOK, version)
+		c.Header("X-Application-Name", "Helm Dashboard by Komodor.io") // to identify ourselves by ourselves
+		c.IndentedJSON(http.StatusOK, data.StatusInfo)
 	})
 
 	configureHelms(api.Group("/api/helm"), data)
@@ -105,6 +107,7 @@ func configureKubectls(api *gin.RouterGroup, data *subproc.DataLayer) {
 	api.GET("/contexts", h.GetContexts)
 	api.GET("/resources/:kind", h.GetResourceInfo)
 	api.GET("/describe/:kind", h.Describe)
+	api.GET("/namespaces", h.GetNameSpaces)
 }
 
 func configureStatic(api *gin.Engine) {

pkg/dashboard/handlers/helmHandlers.go

@@ -23,8 +23,6 @@ func (h *HelmHandler) GetCharts(c *gin.Context) {
 	c.IndentedJSON(http.StatusOK, res)
 }
 
-// TODO: helm show chart komodorio/k8s-watcher to get the icon URL
-
 func (h *HelmHandler) Uninstall(c *gin.Context) {
 	qp, err := utils.GetQueryProps(c, false)
 	if err != nil {
@@ -248,11 +246,11 @@ func handleGetSection(data *subproc.DataLayer, section string, rDiff string, qp
 			return "", err
 		}
 		return res, nil
-	} else {
-		res, err := functor(qp.Namespace, qp.Name, qp.Revision, flag)
-		if err != nil {
-			return "", err
-		}
-		return res, nil
 	}
+
+	res, err := functor(qp.Namespace, qp.Name, qp.Revision, flag)
+	if err != nil {
+		return "", err
+	}
+	return res, nil
 }

pkg/dashboard/handlers/kubeHandlers.go

@@ -1,12 +1,13 @@
 package handlers
 
 import (
+	"net/http"
+
 	"github.com/gin-gonic/gin"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	v12 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
-	"net/http"
 )
 
 type KubeHandler struct {
@@ -69,3 +70,13 @@ func (h *KubeHandler) Describe(c *gin.Context) {
 
 	c.String(http.StatusOK, res)
 }
+
+func (h *KubeHandler) GetNameSpaces(c *gin.Context) {
+	res, err := h.Data.GetNameSpaces()
+	if err != nil {
+		_ = c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	c.JSON(http.StatusOK, res)
+}

pkg/dashboard/handlers/scannerHandlers.go

@@ -12,11 +12,18 @@ type ScannersHandler struct {
 }
 
 func (h *ScannersHandler) List(c *gin.Context) {
-	var res []string
-	for _, scanner := range h.Data.Scanners {
-		res = append(res, scanner.Name())
+	type ScannerInfo struct {
+		SupportedResourceKinds []string
+		ManifestScannable      bool
 	}
-	c.JSON(http.StatusOK, res)
+	res := map[string]ScannerInfo{}
+	for _, scanner := range h.Data.Scanners {
+		res[scanner.Name()] = ScannerInfo{
+			SupportedResourceKinds: scanner.SupportedResourceKinds(),
+			ManifestScannable:      scanner.ManifestIsScannable(),
+		}
+	}
+	c.IndentedJSON(http.StatusOK, res)
 }
 
 func (h *ScannersHandler) ScanDraftManifest(c *gin.Context) {

pkg/dashboard/scanners/checkov.go

@@ -1,11 +1,12 @@
 package scanners
 
 import (
+	"encoding/json"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
+	"github.com/olekukonko/tablewriter"
 	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
-	"strconv"
 	"strings"
 )
 
@@ -13,11 +14,46 @@ type Checkov struct {
 	Data *subproc.DataLayer
 }
 
+func (c *Checkov) ManifestIsScannable() bool {
+	return true
+}
+
+func (c *Checkov) SupportedResourceKinds() []string {
+	// from https://github.com/bridgecrewio/checkov//blob/master/docs/5.Policy%20Index/kubernetes.md
+	return []string{
+		"AdmissionConfiguration",
+		"ClusterRole",
+		"ClusterRoleBinding",
+		"ConfigMap",
+		"CronJob",
+		"DaemonSet",
+		"Deployment",
+		"DeploymentConfig",
+		"Ingress",
+		"Job",
+		"Pod",
+		"PodSecurityPolicy",
+		"PodTemplate",
+		"Policy",
+		"ReplicaSet",
+		"ReplicationController",
+		"Role",
+		"RoleBinding",
+		"Secret",
+		"Service",
+		"ServiceAccount",
+		"StatefulSet",
+	}
+}
+
 func (c *Checkov) Name() string {
 	return "Checkov"
 }
 
 func (c *Checkov) Test() bool {
+	utils.FailLogLevel = log.DebugLevel
+	defer func() { utils.FailLogLevel = log.WarnLevel }()
+
 	res, err := utils.RunCommand([]string{"checkov", "--version"}, nil)
 	if err != nil {
 		return false
@@ -33,7 +69,7 @@ func (c *Checkov) ScanManifests(mnf string) (*subproc.ScanResults, error) {
 	}
 	defer fclose()
 
-	cmd := []string{"checkov", "--quiet", "--soft-fail", "--framework", "kubernetes", "--output", "cli", "--file", fname}
+	cmd := []string{"checkov", "--quiet", "--soft-fail", "--framework", "kubernetes", "--output", "json", "--file", fname}
 	out, err := utils.RunCommand(cmd, nil)
 	if err != nil {
 		return nil, err
@@ -41,7 +77,10 @@ func (c *Checkov) ScanManifests(mnf string) (*subproc.ScanResults, error) {
 
 	res := &subproc.ScanResults{}
 
-	res.OrigReport = out
+	err = json.Unmarshal([]byte(out), res.OrigReport)
+	if err != nil {
+		return nil, err
+	}
 
 	return res, nil
 }
@@ -61,41 +100,46 @@ func (c *Checkov) ScanResource(ns string, kind string, name string) (*subproc.Sc
 	}
 	defer fclose()
 
-	cmd := []string{"checkov", "--quiet", "--soft-fail", "--framework", "kubernetes", "--output", "cli", "--file", fname}
+	cmd := []string{"checkov", "--quiet", "--soft-fail", "--framework", "kubernetes", "--output", "json", "--file", fname}
 	out, err := utils.RunCommand(cmd, nil)
 	if err != nil {
 		return nil, err
 	}
 
-	res := subproc.ScanResults{}
-	_, out, _ = strings.Cut(out, "\n")         // kubernetes scan results:
-	_, out, _ = strings.Cut(out, "\n")         // empty line
-	line, out, found := strings.Cut(out, "\n") // status line
-	if found {
-		parts := strings.FieldsFunc(line, func(r rune) bool {
-			return r == ':' || r == ','
-		})
-		if cnt, err := strconv.Atoi(strings.TrimSpace(parts[1])); err == nil {
-			res.PassedCount = cnt
-		} else {
-			log.Warnf("Failed to parse Checkov output: %s", err)
-		}
-		if cnt, err := strconv.Atoi(strings.TrimSpace(parts[3])); err == nil {
-			res.FailedCount = cnt
-		} else {
-			log.Warnf("Failed to parse Checkov output: %s", err)
-		}
-	} else {
-		log.Warnf("Failed to parse Checkov output")
+	cr := CheckovReport{}
+	err = json.Unmarshal([]byte(out), &cr)
+	if err != nil {
+		return nil, err
 	}
 
-	res.OrigReport = strings.TrimSpace(out)
+	res := &subproc.ScanResults{
+		PassedCount: cr.Summary.Passed,
+		FailedCount: cr.Summary.Failed,
+		OrigReport:  checkovReportTable(&cr),
+	}
 
-	return &res, nil
+	return res, nil
 }
 
-type CheckovResults struct {
-	Summary CheckovSummary
+func checkovReportTable(c *CheckovReport) string {
+	data := [][]string{}
+	for _, item := range c.Results.FailedChecks {
+		data = append(data, []string{item.Id, item.Name + "\n", item.Guideline})
+	}
+
+	tableString := &strings.Builder{}
+	table := tablewriter.NewWriter(tableString)
+	table.SetHeader([]string{"ID", "Name", "Guideline"})
+	table.SetBorder(false)
+	table.SetColWidth(64)
+	table.AppendBulk(data)
+	table.Render()
+	return tableString.String()
+}
+
+type CheckovReport struct {
+	Summary CheckovSummary `json:"summary"`
+	Results CheckovResults `json:"results"`
 }
 
 type CheckovSummary struct {
@@ -105,3 +149,16 @@ type CheckovSummary struct {
 	// parsing errors?
 	// skipped ?
 }
+
+type CheckovResults struct {
+	FailedChecks []CheckovCheck `json:"failed_checks"`
+}
+
+type CheckovCheck struct {
+	Id            string `json:"check_id"`
+	BcId          string `json:"bc_check_id"`
+	Name          string `json:"check_name"`
+	Resource      string `json:"resource"`
+	Guideline     string `json:"guideline"`
+	FileLineRange []int  `json:"file_line_range"`
+}

pkg/dashboard/scanners/trivy.go

@@ -12,11 +12,31 @@ type Trivy struct {
 	Data *subproc.DataLayer
 }
 
+func (c *Trivy) ManifestIsScannable() bool {
+	return false
+}
+
+func (c *Trivy) SupportedResourceKinds() []string {
+	// from https://github.com/aquasecurity/trivy-kubernetes/blob/main/pkg/k8s/k8s.go#L190
+	return []string{
+		"ReplicaSet",
+		"ReplicationController",
+		"StatefulSet",
+		"Deployment",
+		"CronJob",
+		"DaemonSet",
+		"Job",
+	}
+}
+
 func (c *Trivy) Name() string {
 	return "Trivy"
 }
 
 func (c *Trivy) Test() bool {
+	utils.FailLogLevel = log.DebugLevel
+	defer func() { utils.FailLogLevel = log.WarnLevel }()
+
 	res, err := utils.RunCommand([]string{"trivy", "--version"}, nil)
 	if err != nil {
 		return false

pkg/dashboard/server.go

@@ -2,23 +2,37 @@ package dashboard
 
 import (
 	"context"
+	"encoding/json"
 	"github.com/gin-gonic/gin"
+	"github.com/hashicorp/go-version"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/scanners"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/subproc"
 	"github.com/komodorio/helm-dashboard/pkg/dashboard/utils"
 	log "github.com/sirupsen/logrus"
 	"net/http"
 	"os"
+	"strconv"
+	"strings"
+	"time"
 )
 
-func StartServer(version string) (string, utils.ControlChan) {
-	data := subproc.DataLayer{}
+func StartServer(version string, port int, ns string, debug bool, noTracking bool) (string, utils.ControlChan) {
+	data := subproc.DataLayer{
+		Namespace: ns,
+	}
 	err := data.CheckConnectivity()
 	if err != nil {
 		log.Errorf("Failed to check that Helm is operational, cannot continue. The error was: %s", err)
 		os.Exit(1) // TODO: propagate error instead?
 	}
 
+	data.StatusInfo = &subproc.StatusInfo{
+		CurVer:             version,
+		Analytics:          !noTracking,
+		LimitedToNamespace: ns,
+	}
+	go checkUpgrade(data.StatusInfo)
+
 	discoverScanners(&data)
 
 	address := os.Getenv("HD_BIND")
@@ -26,14 +40,10 @@ func StartServer(version string) (string, utils.ControlChan) {
 		address = "localhost"
 	}
 
-	if os.Getenv("HD_PORT") == "" {
-		address += ":8080" // TODO: better default port to clash less?
-	} else {
-		address += ":" + os.Getenv("HD_PORT")
-	}
+	address += ":" + strconv.Itoa(port)
 
 	abort := make(utils.ControlChan)
-	api := NewRouter(abort, &data, version)
+	api := NewRouter(abort, &data, debug)
 	done := startBackgroundServer(address, api, abort)
 
 	return "http://" + address, done
@@ -46,7 +56,12 @@ func startBackgroundServer(addr string, routes *gin.Engine, abort utils.ControlC
 	go func() {
 		err := server.ListenAndServe()
 		if err != nil && err != http.ErrServerClosed {
-			panic(err) // TODO: in case of "port busy", check that it's another instance of us and just open browser
+			log.Warnf("Looks like port is busy for %s, checking if it's us...", addr)
+			if itIsUs(addr) {
+				log.Infof("Yes, it's another instance of us. Just reuse it.")
+			} else {
+				panic(err)
+			}
 		}
 		done <- struct{}{}
 	}()
@@ -62,6 +77,18 @@ func startBackgroundServer(addr string, routes *gin.Engine, abort utils.ControlC
 	return done
 }
 
+func itIsUs(addr string) bool {
+	var myClient = &http.Client{Timeout: 5 * time.Second}
+	r, err := myClient.Get("http://" + addr + "/status")
+	if err != nil {
+		log.Debugf("It's not us on %s: %s", addr, err)
+		return false
+	}
+	defer r.Body.Close()
+
+	return strings.HasPrefix(r.Header.Get("X-Application-Name"), "Helm Dashboard")
+}
+
 func discoverScanners(data *subproc.DataLayer) {
 	potential := []subproc.Scanner{
 		&scanners.Checkov{Data: data},
@@ -75,3 +102,44 @@ func discoverScanners(data *subproc.DataLayer) {
 		}
 	}
 }
+
+func checkUpgrade(d *subproc.StatusInfo) {
+	url := "https://api.github.com/repos/komodorio/helm-dashboard/releases/latest"
+	type GHRelease struct {
+		Name string `json:"name"`
+	}
+
+	var myClient = &http.Client{Timeout: 5 * time.Second}
+	r, err := myClient.Get(url)
+	if err != nil {
+		log.Warnf("Failed to check for new version: %s", err)
+		return
+	}
+	defer r.Body.Close()
+
+	target := new(GHRelease)
+	err = json.NewDecoder(r.Body).Decode(target)
+	if err != nil {
+		log.Warnf("Failed to decode new release version: %s", err)
+		return
+	}
+	d.LatestVer = target.Name
+
+	v1, err := version.NewVersion(d.CurVer)
+	if err != nil {
+		log.Warnf("Failed to parse version: %s", err)
+		v1 = &version.Version{}
+	}
+
+	v2, err := version.NewVersion(d.LatestVer)
+	if err != nil {
+		log.Warnf("Failed to parse version: %s", err)
+	} else {
+		if v1.LessThan(v2) {
+			log.Warnf("Newer Helm Dashboard version is available: %s", d.LatestVer)
+			log.Warnf("Upgrade instructions: https://github.com/komodorio/helm-dashboard#installing")
+		} else {
+			log.Debugf("Got latest version from GH: %s", d.LatestVer)
+		}
+	}
+}

pkg/dashboard/static/actions.js

@@ -26,9 +26,11 @@ function checkUpgradeable(name) {
             $("#btnUpgrade .icon").removeClass("bi-hourglass-split").addClass("bi-x-octagon")
             $("#btnUpgrade").prop("disabled", true)
             $("#btnUpgradeCheck").prop("disabled", true)
+            $("#btnAddRepository").text("Add repository for it")
             return
         }
 
+        $("#btnUpgradeCheck").text("Check for new version")
         const verCur = $("#specRev").data("last-chart-ver");
         const elm = data[0]
         $("#btnUpgradeCheck").data("repo", elm.name.split('/').shift())
@@ -57,6 +59,8 @@ function popUpUpgrade(elm, ns, name, verCur, lastRev) {
 
     $("#upgradeModalLabel .name").text(elm.name)
 
+    $("#upgradeModal .rel-cluster").text(getHashParam("context"))
+
     if (verCur) {
         $("#upgradeModal .ver-old").show().find("span").text(verCur)
         $("#upgradeModal .rel-name").prop("disabled", true).val(name)
@@ -67,6 +71,18 @@ function popUpUpgrade(elm, ns, name, verCur, lastRev) {
         $("#upgradeModal .rel-ns").prop("disabled", false).val("")
     }
 
+    $.getJSON("/api/kube/namespaces").fail(function (xhr) {
+        reportError("Failed to get namespaces", xhr)
+    }).done(function(res) {
+      const ns = res.items.map(i => i.metadata.name)
+      $.each(ns, function(i, item) {
+        $("#upgradeModal #ns-datalist").append($("<option>", {
+          value: item,
+          text: item
+        }))
+      })
+    })
+
     $.getJSON("/api/helm/repo/search?name=" + elm.name).fail(function (xhr) {
         reportError("Failed to find chart in repo", xhr)
     }).done(function (vers) {
@@ -112,7 +128,8 @@ $("#upgradeModal .btn-confirm").click(function () {
     }).done(function (data) {
         if (data.version) {
             setHashParam("section", null)
-            setHashParam("namespace", $("#upgradeModal .rel-ns").val())
+            const ns = $("#upgradeModal .rel-ns").val();
+            setHashParam("namespace", ns ? ns : "default")
             setHashParam("chart", $("#upgradeModal .rel-name").val())
             setHashParam("revision", data.version)
             window.location.reload()
@@ -329,3 +346,7 @@ $("#btnRollback").click(function () {
     })
 })
 
+$("#btnAddRepository").click(function () {
+    setHashParam("section", "repository")
+    window.location.reload()
+})

pkg/dashboard/static/analytics.js

@@ -0,0 +1,59 @@
+const xhr = new XMLHttpRequest();
+xhr.onload = function () {
+    if (xhr.readyState === XMLHttpRequest.DONE) {
+        const status = JSON.parse(xhr.responseText);
+        const version = status.CurVer
+        if (status.Analytics && version !== "dev") {
+            enableDD(version)
+            enableHeap()
+        }
+    }
+}
+xhr.open('GET', '/status', true);
+xhr.send(null);
+
+
+function enableDD(version) {
+    (function (h, o, u, n, d) {
+        h = h[d] = h[d] || {
+            q: [], onReady: function (c) {
+                h.q.push(c)
+            }
+        }
+        d = o.createElement(u);
+        d.async = true;
+        d.src = n
+        n = o.getElementsByTagName(u)[0];
+        n.parentNode.insertBefore(d, n)
+    })(window, document, 'script', 'https://www.datadoghq-browser-agent.com/datadog-rum-v4.js', 'DD_RUM')
+    DD_RUM.onReady(function () {
+        DD_RUM.init({
+            clientToken: 'pub16d64cd1c00cf073ce85af914333bf72',
+            applicationId: 'e75439e5-e1b3-46ba-a9e9-a2e58579a2e2',
+            site: 'datadoghq.com',
+            service: 'helm-dashboard',
+            version: version,
+            trackInteractions: true,
+            trackResources: true,
+            trackLongTasks: true,
+            defaultPrivacyLevel: 'mask',
+            sessionReplaySampleRate: 0
+        })
+    })
+}
+
+function enableHeap() {
+    window.heap = window.heap || [], heap.load = function (e, t) {
+        window.heap.appid = e, window.heap.config = t = t || {};
+        let r = document.createElement("script");
+        r.type = "text/javascript", r.async = !0, r.src = "https://cdn.heapanalytics.com/js/heap-" + e + ".js";
+        let a = document.getElementsByTagName("script")[0];
+        a.parentNode.insertBefore(r, a);
+        for (let n = function (e) {
+            return function () {
+                heap.push([e].concat(Array.prototype.slice.call(arguments, 0)))
+            }
+        }, p = ["addEventProperties", "addUserProperties", "clearEventProperties", "identify", "resetIdentity", "removeEventProperty", "setEventProperties", "track", "unsetEventProperty"], o = 0; o < p.length; o++) heap[p[o]] = n(p[o])
+    };
+    heap.load("3615793373");
+}

pkg/dashboard/static/datadog.js

@@ -1,26 +0,0 @@
-(function(h,o,u,n,d) {
-    h=h[d]=h[d]||{q:[],onReady:function(c){h.q.push(c)}}
-    d=o.createElement(u);d.async=1;d.src=n
-    n=o.getElementsByTagName(u)[0];n.parentNode.insertBefore(d,n)
-})(window,document,'script','https://www.datadoghq-browser-agent.com/datadog-rum-v4.js','DD_RUM')
-    DD_RUM.onReady(function() {
-        const xhr = new XMLHttpRequest();
-        xhr.onreadystatechange = function() {
-            const version = xhr.responseText;
-            if (xhr.readyState === XMLHttpRequest.DONE && version!=="dev") {
-                DD_RUM.init({
-                    clientToken: 'pub16d64cd1c00cf073ce85af914333bf72',
-                    applicationId: 'e75439e5-e1b3-46ba-a9e9-a2e58579a2e2',
-                    site: 'datadoghq.com',
-                    service: 'helm-dashboard',
-                    version: version,
-                    trackInteractions: true,
-                    trackResources: true,
-                    trackLongTasks: true,
-                    defaultPrivacyLevel: 'mask'
-                })
-            }
-        }
-        xhr.open('GET', '/status', true);
-        xhr.send(null);
-})

pkg/dashboard/static/details-view.js

@@ -150,6 +150,12 @@ function showResources(namespace, chart, revision) {
     $.getJSON(url).fail(function (xhr) {
         reportError("Failed to get list of resources", xhr)
     }).done(function (data) {
+        const scanners = $("body").data("scanners");
+        const scannableResKinds = new Set();
+        for (let k in scanners) {
+            scanners[k].SupportedResourceKinds.forEach(scannableResKinds.add, scannableResKinds)
+        }
+
         resBody.empty();
         for (let i = 0; i < data.length; i++) {
             const res = data[i]
@@ -159,7 +165,7 @@ function showResources(namespace, chart, revision) {
                         <div class="col-3 res-name text-break fw-bold"></div>
                         <div class="col-1 res-status overflow-hidden"><span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span></div>
                         <div class="col-4 res-statusmsg"><span class="text-muted small">Getting status...</span></div>
-                        <div class="col-2 res-actions"></div>
+                        <div class="col-2 res-actions"><button class='btn btn-sm ms-2 visually-hidden'>Vertical-sizer</button></div>
                     </div>
             `)
 
@@ -172,7 +178,7 @@ function showResources(namespace, chart, revision) {
                 //reportError("Failed to get list of resources")
             }).done(function (data) {
                 const badge = $("<span class='badge me-2 fw-normal'></span>").text(data.status.phase);
-                if (["Available", "Active", "Established"].includes(data.status.phase)) {
+                if (["Available", "Active", "Established", "Bound", "Ready"].includes(data.status.phase)) {
                     badge.addClass("bg-success text-dark")
                 } else if (["Exists"].includes(data.status.phase)) {
                     badge.addClass("bg-success text-dark bg-opacity-50")
@@ -186,7 +192,7 @@ function showResources(namespace, chart, revision) {
                 statusBlock.empty().append(badge).attr("title", data.status.phase)
                 resBlock.find(".res-statusmsg").html("<span class='text-muted small'>" + (data.status.message ? data.status.message : '') + "</span>")
 
-                if (badge.text() !== "NotFound") {
+                if (badge.text() !== "NotFound" && revision == $("#specRev").data("last-rev")) {
                     resBlock.find(".res-actions")
 
                     const btn = $("<button class=\"btn btn-sm btn-white border-secondary\">Describe</button>");
@@ -195,11 +201,13 @@ function showResources(namespace, chart, revision) {
                         showDescribe(ns, res.kind, res.metadata.name, badge.clone())
                     })
 
-                    const btn2 = $("<button class='btn btn-sm btn-white border-secondary ms-2'>Scan</button>");
-                    resBlock.find(".res-actions").append(btn2)
-                    btn2.click(function () {
-                        scanResource(ns, res.kind, res.metadata.name, badge.clone())
-                    })
+                    if (scannableResKinds.has(res.kind)) {
+                        const btn2 = $("<button class='btn btn-sm btn-white border-secondary ms-2'>Scan</button>");
+                        resBlock.find(".res-actions").append(btn2)
+                        btn2.click(function () {
+                            scanResource(ns, res.kind, res.metadata.name, badge.clone())
+                        })
+                    }
                 }
             })
         }
@@ -237,25 +245,36 @@ function scanResource(ns, kind, name, badge) {
             body.append("No information from scanners. Make sure you have installed some and scanned object is supported.")
         }
 
+        const tabs = $('<ul class="nav nav-tabs mt-3" role="tablist"></ul>')
+        const content = $('<div class="tab-content"></div>')
+
         for (let name in data) {
             const res = data[name]
 
-            if (!res.OrigReport) continue
-            const hdr = $("<h3>" + name + " Scan Results</h3>");
+            if (!res.OrigReport && !res.PassedCount) continue
+
+            const hdr = $(`<li class="nav-item" role="presentation">
+                <button class="nav-link" id="` + name + `-tab" data-bs-toggle="tab" data-bs-target="#` + name + `-tab-pane" type="button" role="tab">` + name + `</button>
+              </li>`)
 
             if (res.FailedCount) {
-                hdr.append("<span class='badge bg-danger ms-3'>" + res.FailedCount + " failed</span>")
+                hdr.find('button').append("<span class='badge bg-danger ms-2'>" + res.FailedCount + " failed</span>")
             }
 
             if (res.PassedCount) {
-                hdr.append("<span class='badge bg-info ms-3'>" + res.PassedCount + " passed</span>")
+                hdr.find('button').append("<span class='badge bg-info ms-2'>" + res.PassedCount + " passed</span>")
             }
 
-            body.append(hdr)
-
             const hl = hljs.highlight(res.OrigReport, {language: 'yaml'}).value
             const pre = $("<pre class='bg-white rounded p-3' style='font-size: inherit; overflow: unset'></pre>").html(hl)
-            body.append(pre)
+            const div = $('<div class="tab-pane fade" id="' + name + '-tab-pane" role="tabpanel" aria-labelledby="profile-tab" tabindex="0"></div>').append(pre)
+
+            tabs.append(hdr)
+            content.append(div)
         }
+
+        body.append(tabs)
+        body.append(content)
+        tabs.find('li').first().find('button').click()
     })
 }

pkg/dashboard/static/index.html

@@ -5,31 +5,16 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Helm Dashboard</title>
-    <script src="static/datadog.js"></script>
+    <script src="static/analytics.js"></script>
     <link rel="stylesheet"
           href="https://fonts.googleapis.com/css2?family=Roboto&family=Inter&family=Poppins:wght@600&family=Poppins:wght@500&family=Inter:wght@500&family=Roboto+Slab:wght@400&family=Roboto+Slab:wght@700&family=Roboto:wght@700&family=Roboto:wght@500"/>
-
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.0/dist/css/bootstrap.min.css" rel="stylesheet"
           integrity="sha384-gH2yIJqKdNHPEq0n4Mqa/HGKIhSkIHeL5AyhkYV8i59U5AR6csBvApHHNl/vI1Bx" crossorigin="anonymous">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/styles/lightfair.min.css"/>
     <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css"/>
+    <link href="static/styles-base.css" rel="stylesheet">
     <link href="static/styles.css" rel="stylesheet">
-    <script type="text/javascript">
-        window.heap = window.heap || [], heap.load = function (e, t) {
-            window.heap.appid = e, window.heap.config = t = t || {};
-            var r = document.createElement("script");
-            r.type = "text/javascript", r.async = !0, r.src = "https://cdn.heapanalytics.com/js/heap-" + e + ".js";
-            var a = document.getElementsByTagName("script")[0];
-            a.parentNode.insertBefore(r, a);
-            for (var n = function (e) {
-                return function () {
-                    heap.push([e].concat(Array.prototype.slice.call(arguments, 0)))
-                }
-            }, p = ["addEventProperties", "addUserProperties", "clearEventProperties", "identify", "resetIdentity", "removeEventProperty", "setEventProperties", "track", "unsetEventProperty"], o = 0; o < p.length; o++) heap[p[o]] = n(p[o])
-        };
-        heap.load("3615793373");
-    </script>
 </head>
 <body>
 
@@ -37,11 +22,8 @@
     <!-- TOP BAR -->
     <nav class="navbar navbar-expand bg-white mb-0 p-0 b-shadow" id="topNav">
         <div class="container-fluid m-0 p-0">
-            <div class="navbar-brand">
-                <a href="/"><img src="static/logo.png" alt="Logo"></a>
-                <div>
-                    <h1><a href="/">Helm Dashboard</a></h1>
-                </div>
+            <div class="navbar-brand me-0">
+                <a href="/"><img src="static/logo-header.svg" alt="Helm Dashboard"></a>
             </div>
 
             <div class="separator-vertical mx-3"><span></span></div>
@@ -53,14 +35,34 @@
                 <li class="nav-item mx-2">
                     <a class="nav-link px-3 section-repo">Repository</a>
                 </li>
+                <li class="nav-item mx-2 dropdown">
+                    <a class="nav-link dropdown-toggle section-help" role="button" data-bs-toggle="dropdown"
+                       aria-expanded="false">
+                        Help
+                    </a>
+                    <ul class="dropdown-menu fs-80">
+                        <li><a class="dropdown-item"
+                               href="https://join.slack.com/t/komodorkommunity/shared_invite/zt-1dm3cnkue-ov1Yh~_95teA35QNx5yuMg"
+                               target="_blank"><i class="bi-slack"></i> Support Chat</a></li>
+                        <li><a class="dropdown-item" href="https://github.com/komodorio/helm-dashboard" target="_blank"><i
+                                class="bi-github"></i> Project Page</a></li>
+                        <li>
+                            <hr class="dropdown-divider">
+                        </li>
+                        <li><a class="dropdown-item disabled" href="#">Version <span id="toolVersion"></span></a></li>
+                    </ul>
+                </li>
+                <li class="nav-item mx-2 display-none upgrade-possible">
+                    <a class="nav-link position-relative text-danger"
+                       href="https://github.com/komodorio/helm-dashboard#installing" target="_blank">
+                        Upgrade to <span id="toolVersionUpgrade"></span>
+                    </a></li>
+
             </ul>
             <div>
                 <a class="btn" href="https://komodor.com/?utm_campaign=Helm-Dash&utm_source=helm-dash"><img
-                        src="https://komodor.com/wp-content/uploads/2021/05/favicon.png" alt="komodor.io"
+                        src="static/komodor-logo.svg" alt="komodor.io"
                         style="height: 1.2rem; vertical-align: text-bottom; filter: grayscale(00%);"></a>
-
-                <a class="btn me-2 text-muted" href="https://github.com/komodorio/helm-dashboard"
-                   title="Project page on GitHub"><i class="bi-github"></i></a>
             </div>
             <div class="separator-vertical"><span></span></div>
             <i class="btn bi-power text-muted p-2 m-1 mx-2" title="Shut down the Helm Dashboard application"></i>
@@ -88,15 +90,16 @@
                 <button class="btn btn-sm btn-light bg-white border border-secondary btn-remove">
                     <i class="bi-trash3"></i> Remove
                 </button>
+                <p class="my-3"><input class="form-control form-control-sm" type="text" placeholder="Filter..."
+                                       id="inputSearch"></p>
             </div>
             <div><span class="text-muted small fw-bold me-3">REPOSITORY</span></div>
             <h2 class="mb-3">name-of-repo</h2>
             <div class="mb-5">
                 <span class="rounded rounded-1 me-2 p-1 px-2 bg-tag text-dark">URL: <span class="url fw-bold">http://somerepo/somepath</span></span>
             </div>
+            <div class="py-2 mb-3 float-end">
 
-            <div class="float-end">
-            <!-- TODO   <input class="form-control form-control-sm" type="text" placeholder="Filter..."> -->
             </div>
             <div class="row bg-secondary rounded px-3 py-2 mb-3 fw-bold small"
                  style="text-transform: uppercase">
@@ -105,7 +108,7 @@
                 <div class="col-1">Version</div>
                 <div class="col-1"></div>
             </div>
-            <ul class="list-unstyled mt-4"></ul>
+            <ul class="list-unstyled mt-4 charts"></ul>
         </div>
     </div>
 
@@ -118,6 +121,7 @@
                     <ul class="list-unstyled" id="cluster">
                     </ul>
 
+                    <h4 id="limitNamespace" class="display-none">Forced Namespace: <span></span></h4>
                     <!-- TODO
                     <h4 class="mt-4">Namespaces</h4>
                     <ul class="list-unstyled" id="namespaces">
@@ -147,6 +151,9 @@
             </div>
 
             <div class="body"></div>
+            <div class="bg-white rounded shadow p-3 display-none no-charts">Looks like you don't have any charts
+                installed. "Repository" section may be a good place to start.
+            </div>
         </div>
         <!-- /INSTALLED LIST -->
     </div>
@@ -175,7 +182,11 @@
                             title="Uninstall the chart"><i class="bi-trash3"></i> Uninstall
                     </button>
                     <br/>
-                    <a class="link small" id="btnUpgradeCheck">Check for new version
+                    <a class="link small" id="btnUpgradeCheck">
+                        <span class="spinner-border spinner-border-sm" style="display: none" role="status"
+                              aria-hidden="true"></span>
+                    </a>
+                    <a class="link small" id="btnAddRepository">
                         <span class="spinner-border spinner-border-sm" style="display: none" role="status"
                               aria-hidden="true"></span>
                     </a>
@@ -251,6 +262,9 @@
                                        data-mode="diff-rev">
                                 Diff with specific revision: <input class="form-input" size="3" id="specRev">
                             </label>
+                            <label class="form-check-label" for="userDefinedVals">
+                                <input class="form-check-input" type="checkbox" id="userDefinedVals"> User-defined only
+                            </label>
                         </form>
                     </nav>
 
@@ -344,7 +358,12 @@
                         Release Name: <input class="form-control rel-name">
                     </label>
                     <label class="form-label me-4 text-dark">
-                        Namespace (optional): <input class="form-control rel-ns">
+                        Namespace (optional):
+                        <input type="text" class="form-control rel-ns" list="ns-datalist"/>
+                        <datalist id="ns-datalist"></datalist>
+                    </label>
+                    <label class="form-label me-4 text-dark">
+                        Cluster: <span class="form-label rel-cluster"></span>
                     </label>
                 </div>
                 <div class="row">
@@ -374,7 +393,8 @@
                 <div id="upgradeModalBody" class="small"></div>
             </form>
             <div class="modal-footer d-flex">
-                <button type="button" class="btn btn-scan bg-white border-secondary">Scan for Problems</button>
+                <button type="button" class="btn btn-scan bg-white border-secondary display-none">Scan for Problems
+                </button>
                 <button type="button" class="btn btn-primary btn-confirm">Confirm</button>
             </div>
         </div>

pkg/dashboard/static/list-view.js

@@ -12,6 +12,10 @@ function loadChartsList() {
             let card = buildChartCard(elm);
             chartsCards.append(card)
         })
+
+        if (!data.length) {
+            $("#installedList .no-charts").show()
+        }
     })
 }
 

pkg/dashboard/static/logo.svg

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="32"
-   height="37"
-   viewBox="0 0 32 37"
+   width="179"
+   height="164"
+   viewBox="0 0 179 164"
    fill="none"
    version="1.1"
-   id="svg4"
+   id="svg20"
    sodipodi:docname="logo.svg"
    inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -13,9 +13,9 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
-     id="defs8" />
+     id="defs24" />
   <sodipodi:namedview
-     id="namedview6"
+     id="namedview22"
      pagecolor="#ffffff"
      bordercolor="#666666"
      borderopacity="1.0"
@@ -23,27 +23,70 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      showgrid="false"
-     inkscape:zoom="34.810811"
-     inkscape:cx="13.228649"
-     inkscape:cy="17.552019"
+     inkscape:zoom="3.9268293"
+     inkscape:cx="39.090062"
+     inkscape:cy="109.24845"
      inkscape:window-width="3840"
      inkscape:window-height="2059"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg4" />
+     inkscape:current-layer="svg20" />
   <rect
-     style="opacity:0.455635;fill:#ffffff;stroke-width:18.0094;fill-opacity:1"
-     id="rect1031"
-     width="17.224331"
-     height="10.929513"
-     x="7.3572245"
-     y="12.500892"
-     ry="0" />
+     style="fill:#ffffff;fill-opacity:1;stroke-width:22.5327"
+     id="rect967"
+     width="113.34328"
+     height="68.482964"
+     x="32.284447"
+     y="47.989918" />
+  <path
+     d="M106.129 93.4776C112.242 93.4776 117.336 86.7533 117.336 78.1951C117.336 69.637 112.242 62.9127 106.129 62.9127C100.016 62.9127 94.9216 69.637 94.9216 78.1951C94.9216 86.7533 100.016 93.4776 106.129 93.4776Z"
+     fill="#1347FF"
+     id="path2" />
+  <path
+     d="M84.1221 78.1951C84.1221 86.5495 79.0279 93.4776 72.915 93.4776C66.802 93.4776 61.7078 86.7533 61.7078 78.1951C61.7078 69.8408 66.802 62.9127 72.915 62.9127C79.0279 62.9127 84.1221 69.8408 84.1221 78.1951Z"
+     fill="#1347FF"
+     id="path4" />
   <path
      fill-rule="evenodd"
      clip-rule="evenodd"
-     d="M18 5V2.29761C18 1.02617 17.1002 0 15.9958 0C14.8915 0 14 1.03576 14 2.29761V5H18ZM28.8285 11.364L30.7394 9.45308C31.6384 8.55404 31.7278 7.19222 30.9469 6.4113C30.166 5.63038 28.8032 5.73239 27.9109 6.62466L26.0001 8.53553L28.8285 11.364ZM1.62465 9.45308L3.53553 11.364L6.36396 8.53553L4.45308 6.62466C3.56081 5.73239 2.19804 5.63038 1.41712 6.4113C0.636208 7.19222 0.72561 8.55404 1.62465 9.45308ZM6 12.8164L7.78385 11H24.2163L26 12.8085V23.1915L24.2163 25H7.78372L6 23.1915V12.8164ZM8.94831 12.977L8.25128 13.6683V22.3438L8.94831 23.0351H23.0733L23.7446 22.3426V13.6694L23.0733 12.977H8.94831ZM20.1736 17.4485C20.1736 18.7679 19.4222 19.8375 18.4953 19.8375C17.5684 19.8375 16.817 18.7679 16.817 17.4485C16.817 16.1291 17.5684 15.0595 18.4953 15.0595C19.4222 15.0595 20.1736 16.1291 20.1736 17.4485ZM13.5045 19.8375C14.4314 19.8375 15.1828 18.7679 15.1828 17.4485C15.1828 16.1291 14.4314 15.0595 13.5045 15.0595C12.5776 15.0595 11.8262 16.1291 11.8262 17.4485C11.8262 18.7679 12.5776 19.8375 13.5045 19.8375ZM14.3641 34.0662V31.3638H18.3641V34.0662C18.3641 35.328 17.4726 36.3638 16.3682 36.3638C15.2638 36.3638 14.3641 35.3376 14.3641 34.0662ZM1.62465 26.9107L3.53553 24.9998L6.36396 27.8282L4.45308 29.7391C3.56081 30.6314 2.19804 30.7334 1.41712 29.9525C0.636204 29.1716 0.725608 27.8097 1.62465 26.9107ZM28.8285 24.9998L30.7394 26.9107C31.6384 27.8097 31.7278 29.1716 30.9469 29.9525C30.166 30.7334 28.8032 30.6314 27.9109 29.7391L26.0001 27.8282L28.8285 24.9998Z"
+     d="M22.5848 48.8529L34.607 37.2383H144.437L156.459 48.6492V114.873L144.437 126.488H34.607L22.5848 114.873V48.8529ZM42.3501 49.8717L37.6635 54.3546V109.575L42.3501 113.854H136.897L141.38 109.371V54.1508L136.897 49.668H42.3501V49.8717Z"
      fill="#1347FF"
-     id="path2" />
+     id="path6" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M175.817 28.68L167.87 36.8306L155.848 25.2159L163.794 17.0653C172.353 8.09963 184.579 19.918 175.817 28.68Z"
+     fill="#1347FF"
+     id="path8" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M97.7744 9.32228V20.5294H81.0656V9.32228C81.0656 -3.10743 97.9781 -3.10743 97.7744 9.32228Z"
+     fill="#1347FF"
+     id="path10" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M81.2693 154.2V142.993H97.9781V154.2C97.9781 166.629 81.0655 166.629 81.2693 154.2Z"
+     fill="#1347FF"
+     id="path12" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M15.2493 17.0653L23.1961 25.2159L11.1739 36.8306L3.22708 28.68C-5.53484 19.918 6.6911 8.09963 15.2493 17.0653Z"
+     fill="#1347FF"
+     id="path14" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M3.0233 134.842L10.9702 126.691L22.9923 138.306L15.0455 146.457C6.48732 155.422 -5.73862 143.604 3.0233 134.842Z"
+     fill="#1347FF"
+     id="path16" />
+  <path
+     fill-rule="evenodd"
+     clip-rule="evenodd"
+     d="M163.591 146.457L155.644 138.306L167.666 126.691L175.613 134.842C184.375 143.604 172.149 155.422 163.591 146.457Z"
+     fill="#1347FF"
+     id="path18" />
 </svg>

pkg/dashboard/static/repo.js

@@ -20,6 +20,7 @@ function loadRepoView() {
         }
 
         items.find("input").click(function () {
+            $("#inputSearch").val('')
             const self = $(this)
             const elm = self.data("item");
             setHashParam("repo", elm.name)
@@ -61,6 +62,19 @@ function loadRepoView() {
     })
 }
 
+$("#inputSearch").keyup(function () {
+    let val = $(this).val().toLowerCase();
+
+    $(".charts li").each(function () {
+        let chartName = $(this.firstElementChild).text().toLowerCase()
+        if (chartName.indexOf(val) >= 0) {
+            $(this).show()
+        } else {
+            $(this).hide()
+        }
+    })
+})
+
 $("#sectionRepo .repo-list .btn").click(function () {
     const myModal = new bootstrap.Modal(document.getElementById('repoAddModal'), {});
     myModal.show()

pkg/dashboard/static/revisions-view.js

@@ -48,14 +48,14 @@ function fillChartHistory(data, namespace, name) {
 
         if (elm.description.startsWith("Rollback to ")) {
             //rev.find(".rev-status").append(" <span class='small fw-normal text-lowercase'>(rollback)</span>")
-            rev.find(".rev-status").append(" <i class='bi-arrow-counterclockwise text-muted' title='"+elm.description+"'></i>")
+            rev.find(".rev-status").append(" <i class='bi-arrow-counterclockwise text-muted' title='" + elm.description + "'></i>")
         }
 
         const nxt = data[x + 1];
         if (nxt && isNewerVersion(elm.chart_ver, nxt.chart_ver)) {
-            rev.find(".rev-changes").html("<span class='strike'>" + nxt.chart_ver + "</span> <i class='text-danger bi-arrow-down-right'></i> " + elm.chart_ver)
+            rev.find(".rev-changes").html("<span class='strike'>" + nxt.chart_ver + "</span> <i class='bi-arrow-down-right'></i> " + elm.chart_ver)
         } else if (nxt && isNewerVersion(nxt.chart_ver, elm.chart_ver)) {
-            rev.find(".rev-changes").html("<span class='strike'>" + nxt.chart_ver + "</span> <i class='text-success bi-arrow-up-right'></i> " + elm.chart_ver)
+            rev.find(".rev-changes").html("<span class='strike'>" + nxt.chart_ver + "</span> <i class='bi-arrow-up-right'></i> " + elm.chart_ver)
         }
 
         rev.data("elm", elm)

pkg/dashboard/static/scripts.js

@@ -17,10 +17,20 @@ $(function () {
     $.getJSON("/api/scanners").fail(function (xhr) {
         reportError("Failed to get list of scanners", xhr)
     }).done(function (data) {
-        if (!data.length) {
-            $("#upgradeModal .btn-scan").hide()
+        $("body").data("scanners", data)
+        for (let k in data) {
+            if (data[k].ManifestScannable) {
+                $("#upgradeModal .btn-scan").show() // TODO: move this to install flow
+            }
         }
     })
+
+    $.getJSON("/status").fail(function (xhr) {
+        reportError("Failed to get tool version", xhr)
+    }).done(function (data) {
+        fillToolVersion(data)
+        $("#limitNamespace").show().find("span").text(data.LimitedToNamespace)
+    })
 })
 
 function initView() {
@@ -44,6 +54,9 @@ function initView() {
 
 $("#topNav ul a").click(function () {
     const self = $(this)
+    if (self.hasClass("section-help")) {
+        return;
+    }
 
     $("#topNav ul a").removeClass("active")
 
@@ -53,8 +66,10 @@ $("#topNav ul a").click(function () {
 
     if (self.hasClass("section-repo")) {
         setHashParam("section", "repository")
-    } else {
+    } else if (self.hasClass("section-installed")) {
         setHashParam("section", null)
+    } else {
+        return
     }
 
     initView()
@@ -186,6 +201,14 @@ $(".bi-power").click(function () {
 })
 
 function isNewerVersion(oldVer, newVer) {
+    if (oldVer && oldVer[0] === 'v') {
+        oldVer = oldVer.substring(1)
+    }
+
+    if (newVer && newVer[0] === 'v') {
+        newVer = newVer.substring(1)
+    }
+
     const oldParts = oldVer.split('.')
     const newParts = newVer.split('.')
     for (let i = 0; i < newParts.length; i++) {
@@ -195,4 +218,12 @@ function isNewerVersion(oldVer, newVer) {
         if (a < b) return false
     }
     return false
+}
+
+function fillToolVersion(data) {
+    $("#toolVersion").text(data.CurVer)
+    if (isNewerVersion(data.CurVer, data.LatestVer)) {
+        $("#toolVersionUpgrade").text(data.LatestVer)
+        $(".upgrade-possible").show()
+    }
 }

pkg/dashboard/static/styles-base.css

@@ -0,0 +1,81 @@
+.link, .nav-link {
+    cursor: pointer;
+}
+
+.strike {
+    text-decoration: line-through;
+}
+
+.text-muted {
+    color: #707583 !important;
+}
+
+.border-other {
+    border-color: #9195A1 !important;
+}
+
+.text-other {
+    color: #9195A1 !important;
+}
+
+.border-failed {
+    border-color: #FC1683 !important;
+}
+
+.text-failed {
+    color: #FC1683 !important;
+}
+
+.border-deployed {
+    border-color: #1BE99A !important;
+}
+
+.text-deployed {
+    color: #1FA470 !important;
+}
+
+.border-pending {
+    border-color: #5AB0FF !important;
+}
+
+.text-pending {
+    color: #5AB0FF !important;
+}
+
+.bg-tag {
+    background-color: #D6EFFE;
+}
+
+.bg-tag.text-dark {
+    color: #333333 !important;
+}
+
+.bg-danger {
+    background-color: #FC1683 !important;
+}
+
+.bg-success {
+    background-color: #A4F8D7 !important;
+}
+
+.btn {
+    font-weight: 500;
+}
+
+.btn-primary {
+    background-color: #1347FF;
+}
+
+.text-uppercase {
+    text-transform: uppercase;
+}
+
+.offcanvas {
+    width: auto !important;
+    max-width: 90%;
+    min-width: 60%;
+}
+
+.fs-80 {
+    font-size: 0.8rem!important;
+}

pkg/dashboard/static/styles.css

@@ -1,81 +1,3 @@
-.link, .nav-link {
-    cursor: pointer;
-}
-
-.strike {
-    text-decoration: line-through;
-}
-
-.text-muted {
-    color: #707583 !important;
-}
-
-.border-other {
-    border-color: #9195A1 !important;
-}
-
-.text-other {
-    color: #9195A1 !important;
-}
-
-.border-failed {
-    border-color: #FC1683 !important;
-}
-
-.text-failed {
-    color: #FC1683 !important;
-}
-
-.border-deployed {
-    border-color: #1BE99A !important;
-}
-
-.text-deployed {
-    color: #1FA470 !important;
-}
-
-.border-pending {
-    border-color: #5AB0FF !important;
-}
-
-.text-pending {
-    color: #5AB0FF !important;
-}
-
-.bg-tag {
-    background-color: #D6EFFE;
-}
-
-.bg-tag.text-dark {
-    color: #333333 !important;
-}
-
-.bg-danger {
-    background-color: #FC1683 !important;
-}
-
-.bg-success {
-    background-color: #A4F8D7 !important;
-}
-
-.btn {
-    font-weight: 500;
-}
-
-.btn-primary {
-    background-color: #1347FF;
-}
-
-.text-uppercase {
-    text-transform: uppercase;
-}
-
-.offcanvas {
-    width: auto !important;
-    max-width: 90%;
-    min-width: 60%;
-}
-
 html {
     min-height: 100%;
 }
@@ -104,22 +26,11 @@ body > .container-fluid {
     min-height: 100% !important;
 }
 
-#topNav.navbar {
-}
-
-.navbar-brand {
-    font-family: Poppins, serif;
-    font-size: 0.6rem !important;
-    color: #707583;
-    font-weight: 500;
-    text-decoration: none;
-}
-
 .navbar-brand > a > img {
     vertical-align: middle;
-    height: 2.5rem;
+    height: 3rem;
     display: inline-block;
-    margin: 0.5rem 0.8rem
+    margin: 0.25rem 0.75rem
 }
 
 .navbar-brand > div {
@@ -156,6 +67,10 @@ body > .container-fluid {
     color: #3B3D45 !important;
 }
 
+#topNav .nav-link.text-danger {
+   color: #FC1683 !important;
+}
+
 #topNav .nav-link.active {
     background: #EBEFFF;
     border-radius: 2px;
@@ -234,6 +149,10 @@ span.link {
     text-decoration: underline;
 }
 
+#installedList .body .row div {
+    overflow: hidden;
+}
+
 #installedList .rel-name {
     padding-left: 5.5rem;
     background-image: url("helm-gray-50.svg");
@@ -288,17 +207,17 @@ span.link {
     position: static;
 }
 
-.nav-tabs {
+nav .nav-tabs {
     border: none;
     margin-bottom: 1rem;
 }
 
-.nav-tabs .nav-link {
+nav .nav-tabs .nav-link {
     padding-bottom: 0.25rem;
     color: #3B3D45;
 }
 
-.nav-tabs .nav-link.active {
+nav .nav-tabs .nav-link.active {
     border: none;
     border-bottom: 3px solid #3B3D45;
     background-color: transparent;

pkg/dashboard/subproc/data.go

@@ -5,6 +5,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
+	"sort"
+	"strconv"
+	"strings"
+	"time"
+
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 	"github.com/hexops/gotextdiff/span"
@@ -13,11 +19,6 @@ import (
 	"gopkg.in/yaml.v3"
 	"helm.sh/helm/v3/pkg/release"
 	v1 "k8s.io/apimachinery/pkg/apis/testapigroup/v1"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
 )
 
 type DataLayer struct {
@@ -25,10 +26,23 @@ type DataLayer struct {
 	Helm        string
 	Kubectl     string
 	Scanners    []Scanner
+	StatusInfo  *StatusInfo
+	Namespace   string
+}
+
+type StatusInfo struct {
+	CurVer             string
+	LatestVer          string
+	Analytics          bool
+	LimitedToNamespace string
 }
 
 func (d *DataLayer) runCommand(cmd ...string) (string, error) {
-	log.Debugf("Starting command: %s", cmd)
+	for i, c := range cmd {
+		if c == "--namespace" && i < len(cmd) { // TODO: in case it's not found - add it?
+			d.forceNamespace(&cmd[i+1])
+		}
+	}
 
 	return utils.RunCommand(cmd, map[string]string{"HELM_KUBECONTEXT": d.KubeContext})
 }
@@ -47,7 +61,6 @@ func (d *DataLayer) runCommandHelm(cmd ...string) (string, error) {
 }
 
 func (d *DataLayer) runCommandKubectl(cmd ...string) (string, error) {
-	// TODO: migrate into using kubectl "k8s.io/kubectl/pkg/cmd" and kube API
 	if d.Kubectl == "" {
 		d.Kubectl = "kubectl"
 	}
@@ -61,6 +74,12 @@ func (d *DataLayer) runCommandKubectl(cmd ...string) (string, error) {
 	return d.runCommand(cmd...)
 }
 
+func (d *DataLayer) forceNamespace(s *string) {
+	if d.Namespace != "" {
+		*s = d.Namespace
+	}
+}
+
 func (d *DataLayer) CheckConnectivity() error {
 	contexts, err := d.ListContexts()
 	if err != nil {
@@ -122,8 +141,16 @@ func (d *DataLayer) ListContexts() (res []KubeContext, err error) {
 }
 
 func (d *DataLayer) ListInstalled() (res []ReleaseElement, err error) {
+	cmd := []string{"ls", "--all", "--output", "json", "--time-format", time.RFC3339}
+
 	// TODO: filter by namespace
-	out, err := d.runCommandHelm("ls", "--all", "--all-namespaces", "--output", "json", "--time-format", time.RFC3339)
+	if d.Namespace == "" {
+		cmd = append(cmd, "--all-namespaces")
+	} else {
+		cmd = append(cmd, "--namespace", d.Namespace)
+	}
+
+	out, err := d.runCommandHelm(cmd...)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +164,7 @@ func (d *DataLayer) ListInstalled() (res []ReleaseElement, err error) {
 
 func (d *DataLayer) ChartHistory(namespace string, chartName string) (res []*HistoryElement, err error) {
 	// TODO: there is `max` but there is no `offset`
-	out, err := d.runCommandHelm("history", chartName, "--namespace", namespace, "--output", "json", "--max", "18")
+	out, err := d.runCommandHelm("history", chartName, "--namespace", namespace, "--output", "json")
 	if err != nil {
 		return nil, err
 	}
@@ -152,7 +179,7 @@ func (d *DataLayer) ChartHistory(namespace string, chartName string) (res []*His
 		if err != nil {
 			return nil, err
 		}
-		elm.ChartName = chartRepoName
+		elm.ChartName = chartRepoName // TODO: move it to frontend?
 		elm.ChartVer = curVer
 		elm.Updated.Time = elm.Updated.Time.Round(time.Second)
 	}
@@ -212,6 +239,7 @@ func enrichRepoChartsWithInstalled(charts []*RepoChartElement, installed []Relea
 
 			pieces := strings.Split(chart.Name, "/")
 			if pieces[1] == c {
+				// TODO: there can be more than one
 				chart.InstalledNamespace = rel.Namespace
 				chart.InstalledName = rel.Name
 			}
@@ -452,6 +480,20 @@ func (d *DataLayer) ChartRepoDelete(name string) (string, error) {
 	return out, nil
 }
 
+func (d *DataLayer) GetNameSpaces() (res *NamespaceElement, err error) {
+	out, err := d.runCommandKubectl("get", "namespaces", "-o", "json")
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal([]byte(out), &res)
+	if err != nil {
+		return nil, err
+	}
+
+	return res, nil
+}
+
 func RevisionDiff(functor SectionFn, ext string, namespace string, name string, revision1 int, revision2 int, flag bool) (string, error) {
 	if revision1 == 0 || revision2 == 0 {
 		log.Debugf("One of revisions is zero: %d %d", revision1, revision2)

pkg/dashboard/subproc/helmTypes.go

@@ -24,8 +24,9 @@ type HistoryElement struct {
 	Chart       string         `json:"chart"`
 	AppVersion  string         `json:"app_version"`
 	Description string         `json:"description"`
-	ChartName   string         `json:"chart_name"`
-	ChartVer    string         `json:"chart_ver"`
+
+	ChartName string `json:"chart_name"` // custom addition on top of Helm
+	ChartVer  string `json:"chart_ver"`  // custom addition on top of Helm
 }
 
 type RepoChartElement struct {
@@ -42,3 +43,11 @@ type RepositoryElement struct {
 	Name string `json:"name"`
 	URL  string `json:"url"`
 }
+
+type NamespaceElement struct {
+	Items []struct {
+		Metadata struct {
+			Name string `json:"name"`
+		} `json:"metadata"`
+	} `json:"items"`
+}

pkg/dashboard/subproc/scan.go

@@ -5,6 +5,8 @@ type Scanner interface {
 	Test() bool                                                             // test if the scanner is available
 	ScanManifests(mnf string) (*ScanResults, error)                         // run the scanner on manifests
 	ScanResource(ns string, kind string, name string) (*ScanResults, error) // run the scanner on k8s resource
+	SupportedResourceKinds() []string
+	ManifestIsScannable() bool
 }
 
 type ScanResults struct {

pkg/dashboard/utils/utils.go

@@ -12,6 +12,8 @@ import (
 	"strings"
 )
 
+var FailLogLevel = log.WarnLevel // allows to suppress error logging in some situations
+
 type ControlChan = chan struct{}
 
 func ChartAndVersion(x string) (string, string, error) {
@@ -34,7 +36,7 @@ func TempFile(txt string) (string, func(), error) {
 		return "", nil, err
 	}
 
-	return file.Name(), func() { os.Remove(file.Name()) }, nil
+	return file.Name(), func() { _ = os.Remove(file.Name()) }, nil
 }
 
 type CmdError struct {
@@ -49,6 +51,7 @@ func (e CmdError) Error() string {
 }
 
 func RunCommand(cmd []string, env map[string]string) (string, error) {
+	log.Debugf("Starting command: %s", cmd)
 	prog := exec.Command(cmd[0], cmd[1:]...)
 	prog.Env = os.Environ()
 
@@ -63,10 +66,10 @@ func RunCommand(cmd []string, env map[string]string) (string, error) {
 	prog.Stderr = &stderr
 
 	if err := prog.Run(); err != nil {
-		log.Warnf("Failed command: %s", cmd)
+		log.StandardLogger().Logf(FailLogLevel, "Failed command: %s", cmd)
 		serr := stderr.Bytes()
 		if serr != nil {
-			log.Warnf("STDERR:\n%s", serr)
+			log.StandardLogger().Logf(FailLogLevel, "STDERR:\n%s", serr)
 		}
 		if eerr, ok := err.(*exec.ExitError); ok {
 			return "", CmdError{

pkg/dashboard/utils/utils_test.go

@@ -0,0 +1,96 @@
+package utils
+
+import (
+	"github.com/gin-gonic/gin"
+	"net/http/httptest"
+	"testing"
+)
+
+func TestGetQueryProps(t *testing.T) {
+	gin.SetMode(gin.TestMode)
+	tests := []struct {
+		name        string
+		endpoint    string
+		revRequired bool
+		wantErr     bool
+	}{
+		{
+			name:        "Get query props - all set with revRequired true",
+			wantErr:     false,
+			revRequired: true,
+			endpoint:    "/api/v1/namespaces/komodorio/charts?name=testing&namespace=testing&revision=1",
+		},
+		{
+			name:        "Get query props - no revision with revRequired true",
+			wantErr:     true,
+			revRequired: true,
+			endpoint:    "/api/v1/namespaces/komodorio/charts?name=testing&namespace=testing",
+		},
+		{
+			name:        "Get query props - no namespace with revRequired true",
+			wantErr:     false,
+			revRequired: true,
+			endpoint:    "/api/v1/namespaces/komodorio/charts?name=testing&revision=1",
+		},
+		{
+			name:        "Get query props - no name with revRequired true",
+			wantErr:     true,
+			revRequired: true,
+			endpoint:    "/api/v1/namespaces/komodorio/charts?namespace=testing&revision=1",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			w := httptest.NewRecorder()
+			c, _ := gin.CreateTestContext(w)
+			c.Request = httptest.NewRequest("GET", tt.endpoint, nil)
+			_, err := GetQueryProps(c, tt.revRequired)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("GetQueryProps() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+		})
+	}
+}
+
+func TestChartAndVersion(t *testing.T) {
+	tests := []struct {
+		name      string
+		params    string
+		wantChart string
+		wantVer   string
+		wantError bool
+	}{
+		{
+			name:      "Chart and version - successfully parsing chart and version",
+			params:    "chart-1.0.0",
+			wantChart: "chart",
+			wantVer:   "1.0.0",
+			wantError: false,
+		},
+		{
+			name:      "Chart and version - parsing chart without version",
+			params:    "chart",
+			wantError: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			a, b, err := ChartAndVersion(tt.params)
+			if (err != nil) != tt.wantError {
+				t.Errorf("ChartAndVersion() error = %v, wantErr %v", err, tt.wantError)
+				return
+			}
+
+			if a != tt.wantChart {
+				t.Errorf("ChartAndVersion() got = %v, want %v", a, tt.wantChart)
+			}
+
+			if b != tt.wantVer {
+				t.Errorf("ChartAndVersion() got1 = %v, want %v", b, tt.wantVer)
+			}
+		})
+	}
+}

plugin.yaml

@@ -1,8 +1,9 @@
 name: "dashboard"
-version: "0.2.0"
+version: "0.2.5"
 usage: "A simplified way of working with Helm"
 description: "View HELM situation in nice web UI"
 command: "$HELM_PLUGIN_DIR/bin/helm-dashboard"
+ignoreFlags: false
 hooks:
   install: "cd $HELM_PLUGIN_DIR; scripts/install_plugin.sh"
   update: "cd $HELM_PLUGIN_DIR; scripts/install_plugin.sh"

scripts/install_plugin.sh

@@ -62,3 +62,8 @@ fi
 tar xzf "releases/v${version}.tar.gz" -C "releases/v${version}"
 mv "releases/v${version}/${name}" "bin/${name}" || \
     mv "releases/v${version}/${name}.exe" "bin/${name}"
+
+echo
+echo "Helm Dashboard is installed, to start it, run in your terminal:"
+echo "    helm dashboard"
+echo