Merge pull request #294 from replicatedhq/divolgin/no-rrd

Remove RRD dependency and switch to dynamic linking

Author: divolgin

Makefile

@@ -30,7 +30,6 @@ endif
 define LDFLAGS
 -ldflags "\
 	-s -w \
-	-extldflags \"-static\" \
 	-X ${VERSION_PACKAGE}.version=${VERSION} \
 	-X ${VERSION_PACKAGE}.gitSHA=${GIT_SHA} \
 	-X ${VERSION_PACKAGE}.buildTime=${DATE} \

README.md

@@ -39,20 +39,3 @@ For details on creating the custom resource files that drive support-bundle coll
 # Community
 
 For questions about using Troubleshoot, there's a [Replicated Community](https://help.replicated.com/community) forum, and a [#app-troubleshoot channel in Kubernetes Slack](https://kubernetes.slack.com/channels/app-troubleshoot).
-
-# Building
-
-The following packages are required for building the project from source code:
-
-pkg-config
-librrd-dev
-libglib2.0-dev
-libcairo2-dev
-libpango1.0-dev
-libpixman-1-dev
-libpng-dev
-libsdl-pango-dev
-libthai-dev
-libpcre3-dev
-
-There are known issues with libc6 2.27-3ubuntu1.2 on Ubuntu 18.  Upgrading to 2.27-3ubuntu1.3 (apt-get install libc6) resolves these.

deploy/.goreleaser.yaml

@@ -10,7 +10,7 @@ builds:
     goarch:
       - amd64
     env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
       - GO111MODULE=on
     main: ffi/main.go
     flags: -buildmode=c-shared
@@ -23,13 +23,12 @@ builds:
     goarch:
       - amd64
     env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
     main: cmd/preflight/main.go
     ldflags: -s -w
       -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-      -extldflags "-static"
     flags: -tags netgo -installsuffix netgo
     binary: preflight
     hooks: {}
@@ -45,7 +44,6 @@ builds:
       -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-      -extldflags "-static"
     flags: -tags netgo -installsuffix netgo
     binary: preflight
     hooks: {}
@@ -56,13 +54,12 @@ builds:
     goarch:
       - amd64
     env:
-      - CGO_ENABLED=1
+      - CGO_ENABLED=0
     main: cmd/troubleshoot/main.go
     ldflags: -s -w
       -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-      -extldflags "-static"
     flags: -tags netgo -installsuffix netgo
     binary: support-bundle
     hooks: {}
@@ -78,7 +75,6 @@ builds:
       -X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
       -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
-      -extldflags "-static"
     flags: -tags netgo -installsuffix netgo
     binary: support-bundle
     hooks: {}

pkg/analyze/analyzer.go

@@ -251,20 +251,6 @@ func Analyze(analyzer *troubleshootv1beta2.Analyze, getFile getCollectedFileCont
 		}
 		return []*AnalyzeResult{result}, nil
 	}
-	if analyzer.Collectd != nil {
-		isExcluded, err := isExcluded(analyzer.Collectd.Exclude)
-		if err != nil {
-			return nil, err
-		}
-		if isExcluded {
-			return nil, nil
-		}
-		result, err := analyzeCollectd(analyzer.Collectd, findFiles)
-		if err != nil {
-			return nil, err
-		}
-		return []*AnalyzeResult{result}, nil
-	}
 	return nil, errors.New("invalid analyzer")
 
 }