diff --git a/Makefile b/Makefile index 71f1d085..fc786c0c 100644 --- a/Makefile +++ b/Makefile @@ -156,14 +156,11 @@ build-linux: export PWD=`pwd` @for arch in $(ARCHS);\ do \ - for os in $(OS);\ - do \ - echo "Building v$$VERSION for $$os-$$arch"; \ - mkdir -p releases/statping-$$os-$$arch/; \ - GO111MODULE="on" GOOS=$$os GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-$$os-$$arch/statping ${PWD}/cmd || true; \ - chmod +x releases/statping-$$os-$$arch/statping || true; \ - tar -czf releases/statping-$$os-$$arch.tar.gz -C releases/statping-$$os-$$arch statping || true; \ - done \ + echo "Building v${VERSION} for linux-$$arch"; \ + mkdir -p releases/statping-$$os-$$arch/; \ + GO111MODULE="on" GOOS=$$os GOARCH=$$arch go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-$$os-$$arch/statping ${PWD}/cmd || true; \ + chmod +x releases/statping-$$os-$$arch/statping || true; \ + tar -czf releases/statping-$$os-$$arch.tar.gz -C releases/statping-$$os-$$arch statping || true; \ done find ./releases/ -name "*.tar.gz" -type f -size +1M -exec mv "{}" build/ \; @@ -172,9 +169,9 @@ build-mac: export PWD=`pwd` @for arch in $(ARCHS);\ do \ - echo "Building v$$VERSION for darwin-$$arch"; \ + echo "Building v${VERSION} for darwin-$$arch"; \ mkdir -p releases/statping-darwin-$$arch/; \ - GO111MODULE="on" GOOS=darwin GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-darwin-$$arch/statping ${PWD}/cmd || true; \ + GO111MODULE="on" GOOS=darwin GOARCH=$$arch go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-darwin-$$arch/statping ${PWD}/cmd || true; \ chmod +x releases/statping-darwin-$$arch/statping || true; \ tar -czf releases/statping-darwin-$$arch.tar.gz -C releases/statping-darwin-$$arch statping || true; \ done @@ -185,9 +182,9 @@ build-win: export PWD=`pwd` @for arch in $(ARCHS);\ do \ - echo "Building v$$VERSION for windows-$$arch"; \ + echo "Building v${VERSION} for windows-$$arch"; \ mkdir -p releases/statping-windows-$$arch/; \ - GO111MODULE="on" GOOS=windows GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-windows-$$arch/statping.exe ${PWD}/cmd || true; \ + GO111MODULE="on" GOOS=windows GOARCH=$$arch go build -a -ldflags "-s -w -extldflags -static -X main.VERSION=${VERSION}" -o releases/statping-windows-$$arch/statping.exe ${PWD}/cmd || true; \ chmod +x releases/statping-windows-$$arch/statping.exe || true; \ zip -j releases/statping-windows-$$arch.zip releases/statping-windows-$$arch/statping.exe || true; \ done diff --git a/README.md b/README.md index 57486f02..c3854821 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Statping - Web and App Status Monitoring for Any Type of Project
-View Wiki | Demo | iPhone | Android
API | Docker | EC2 | Mac | Linux | Windows +View Wiki | Demo | iPhone | Android
API | Docker | EC2 | Mac | Linux | Windows

# Statping - Status Page & Monitoring Server diff --git a/cmd/cli.go b/cmd/cli.go index 2af7da54..ffbed998 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -46,7 +46,7 @@ func exportCli(args []string) error { if err := source.Assets(); err != nil { return err } - config, err := configs.LoadConfigs() + config, err := configs.LoadConfigs(configFile) if err != nil { return err } @@ -168,7 +168,7 @@ func importCli(args []string) error { log.Printf("Messages: %d\n", len(exportData.Messages)) log.Printf("Users: %d\n", len(exportData.Users)) - config, err := configs.LoadConfigs() + config, err := configs.LoadConfigs(configFile) if err != nil { return err } @@ -258,7 +258,7 @@ func updateDisplay() error { // runOnce will initialize the Statping application and check each service 1 time, will not run HTTP server func runOnce() error { - config, err := configs.LoadConfigs() + config, err := configs.LoadConfigs(configFile) if err != nil { return errors.Wrap(err, "config.yml file not found") } diff --git a/cmd/flags.go b/cmd/flags.go index 85ba871d..130a958e 100644 --- a/cmd/flags.go +++ b/cmd/flags.go @@ -3,6 +3,14 @@ package main import ( "github.com/spf13/cobra" "github.com/spf13/viper" + "github.com/statping/statping/utils" +) + +var ( + ipAddress string + configFile string + verboseMode int + port int ) func parseFlags(cmd *cobra.Command) { @@ -14,4 +22,7 @@ func parseFlags(cmd *cobra.Command) { cmd.PersistentFlags().IntVarP(&verboseMode, "verbose", "v", 2, "verbose logging") viper.BindPFlag("verbose", cmd.PersistentFlags().Lookup("verbose")) + + cmd.PersistentFlags().StringVarP(&configFile, "config", "c", utils.Directory+"/config.yml", "path to config.yml file") + viper.BindPFlag("config", cmd.PersistentFlags().Lookup("config")) } diff --git a/cmd/main.go b/cmd/main.go index 01416ce7..14f98f0a 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -20,13 +20,9 @@ var ( // VERSION stores the current version of Statping VERSION string // COMMIT stores the git commit hash for this version of Statping - COMMIT string - ipAddress string - //grpcPort int - verboseMode int - port int - log = utils.Log.WithField("type", "cmd") - confgs *configs.DbConfig + COMMIT string + log = utils.Log.WithField("type", "cmd") + confgs *configs.DbConfig ) func init() { @@ -83,7 +79,7 @@ func start() { // log.Warnln(err) //} - confgs, err = configs.LoadConfigs() + confgs, err = configs.LoadConfigs(configFile) if err != nil { log.Infoln("Starting in Setup Mode") if err := SetupMode(); err != nil { diff --git a/frontend/src/assets/scss/base.scss b/frontend/src/assets/scss/base.scss index c9e6b98e..ae4cca9e 100644 --- a/frontend/src/assets/scss/base.scss +++ b/frontend/src/assets/scss/base.scss @@ -14,6 +14,18 @@ HTML,BODY { transition: height 0.3s ease; } +.service-tm-menu { + width: 210px; + height: 355px; + bottom: 15px; + left: -25px; + position: absolute; + background-color: #ffffffd4; + border: 0; + border-radius: 0; + box-shadow: 0px 3px 6px 1px rgba(0,0,0,0.08); +} + .copy-btn { position: absolute; right: 0; diff --git a/frontend/src/components/Index/GroupServiceFailures.vue b/frontend/src/components/Index/GroupServiceFailures.vue index a18926fb..96c5d2ab 100644 --- a/frontend/src/components/Index/GroupServiceFailures.vue +++ b/frontend/src/components/Index/GroupServiceFailures.vue @@ -34,11 +34,12 @@ export default { }, computed: { service_txt() { - if (!this.service.online) { - if (!this.toUnix(this.service.last_success)) { + const s = this.service + if (!s.online) { + if (!this.toUnix(this.parseISO(s.last_success))) { return `Always Offline` } - return `Offline for ${this.ago(this.service.last_success)}` + return `Offline for ${this.ago(s.last_success)}` } return `${this.service.online_24_hours}% Uptime` } diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue index 3015b7eb..88264a69 100644 --- a/frontend/src/components/Service/ServiceBlock.vue +++ b/frontend/src/components/Service/ServiceBlock.vue @@ -19,35 +19,45 @@
- - View More Details - + + View More Details +
-
- +
-
- -
- {{timeframe.text}} -
- - - {{smallText(service)}} - +
+ +
+ {{timeframe.text}}
+
+ +
+ +
+ {{interval.text}} +
+ + + {{smallText(service)}} + +
+
+