Compare commits
20 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c3a0fb7fb5 | |||
| 5e87608587 | |||
| ab7fd107e7 | |||
| 550cd59093 | |||
| a8621d2bb0 | |||
| 4b1d9dc2d3 | |||
| 22769b962e | |||
| feb7909961 | |||
| 2f01e8c8e0 | |||
| 31c2daedf7 | |||
| ee893cc360 | |||
| d73907d357 | |||
| 0b50305f38 | |||
| ee3d719c3a | |||
| d76cdca4a5 | |||
| b34ed607b7 | |||
| 932e191510 | |||
| 3a6c407fe7 | |||
| 8c3afc31f4 | |||
| fb7848f341 |
@@ -74,13 +74,6 @@ jobs:
|
|||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
- name: "Populate frontend version information"
|
- name: "Populate frontend version information"
|
||||||
run: "cd webapp/frontend && ./git.version.sh"
|
run: "cd webapp/frontend && ./git.version.sh"
|
||||||
- name: "Install Node"
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- name: "Generate frontend"
|
|
||||||
run: |
|
|
||||||
make binary-frontend && echo "print contents of ./dist" && ls -alt ./dist
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v2
|
||||||
with:
|
with:
|
||||||
@@ -132,13 +125,6 @@ jobs:
|
|||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
- name: "Populate frontend version information"
|
- name: "Populate frontend version information"
|
||||||
run: "cd webapp/frontend && ./git.version.sh"
|
run: "cd webapp/frontend && ./git.version.sh"
|
||||||
- name: "Install Node"
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- name: "Generate frontend"
|
|
||||||
run: |
|
|
||||||
make binary-frontend && echo "print contents of ./dist" && ls -alt ./dist
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -19,13 +19,6 @@ jobs:
|
|||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v2
|
||||||
- name: "Populate frontend version information"
|
- name: "Populate frontend version information"
|
||||||
run: "cd webapp/frontend && ./git.version.sh"
|
run: "cd webapp/frontend && ./git.version.sh"
|
||||||
- name: "Install Node"
|
|
||||||
uses: actions/setup-node@v3
|
|
||||||
with:
|
|
||||||
node-version: 16
|
|
||||||
- name: "Generate frontend"
|
|
||||||
run: |
|
|
||||||
make binary-frontend && echo "print contents of ./dist" && ls -alt ./dist
|
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2
|
uses: docker/setup-qemu-action@v2
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ binary-frontend: export NPM_CONFIG_LOGLEVEL = warn
|
|||||||
binary-frontend: export NG_CLI_ANALYTICS = false
|
binary-frontend: export NG_CLI_ANALYTICS = false
|
||||||
binary-frontend:
|
binary-frontend:
|
||||||
cd webapp/frontend
|
cd webapp/frontend
|
||||||
npm install -g @angular/cli@9.1.4
|
npm install -g @angular/cli@v13-lts
|
||||||
mkdir -p $(CURDIR)/dist
|
mkdir -p $(CURDIR)/dist
|
||||||
npm ci
|
npm ci
|
||||||
npm run build:prod -- --output-path=$(CURDIR)/dist
|
npm run build:prod -- --output-path=$(CURDIR)/dist
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ Scrutiny supports sending SMART device failure notifications via the following s
|
|||||||
- IFTTT
|
- IFTTT
|
||||||
- Join
|
- Join
|
||||||
- Mattermost
|
- Mattermost
|
||||||
|
- ntfy
|
||||||
- Pushbullet
|
- Pushbullet
|
||||||
- Pushover
|
- Pushover
|
||||||
- Slack
|
- Slack
|
||||||
|
|||||||
@@ -30,8 +30,14 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configFilePath := "/opt/scrutiny/config/collector.yaml"
|
||||||
|
configFilePathAlternative := "/opt/scrutiny/config/collector.yml"
|
||||||
|
if !utils.FileExists(configFilePath) && utils.FileExists(configFilePathAlternative) {
|
||||||
|
configFilePath = configFilePathAlternative
|
||||||
|
}
|
||||||
|
|
||||||
//we're going to load the config file manually, since we need to validate it.
|
//we're going to load the config file manually, since we need to validate it.
|
||||||
err = config.ReadConfig("/opt/scrutiny/config/collector.yaml") // Find and read the config file
|
err = config.ReadConfig(configFilePath) // Find and read the config file
|
||||||
if _, ok := err.(errors.ConfigFileMissingError); ok { // Handle errors reading the config file
|
if _, ok := err.(errors.ConfigFileMissingError); ok { // Handle errors reading the config file
|
||||||
//ignore "could not find config file"
|
//ignore "could not find config file"
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
|||||||
+28
-16
@@ -1,50 +1,62 @@
|
|||||||
|
# syntax=docker/dockerfile:1.4
|
||||||
########################################################################################################################
|
########################################################################################################################
|
||||||
# Omnibus Image
|
# Omnibus Image
|
||||||
# NOTE: this image requires the `make binary-frontend` target to have been run before `docker build` The `dist` directory must exist.
|
|
||||||
########################################################################################################################
|
########################################################################################################################
|
||||||
|
|
||||||
|
######## Build the frontend
|
||||||
|
FROM --platform=${BUILDPLATFORM} node AS frontendbuild
|
||||||
|
WORKDIR /go/src/github.com/analogj/scrutiny
|
||||||
|
COPY --link . /go/src/github.com/analogj/scrutiny
|
||||||
|
|
||||||
########
|
RUN make binary-frontend
|
||||||
|
|
||||||
|
|
||||||
|
######## Build the backend
|
||||||
FROM golang:1.20-bullseye as backendbuild
|
FROM golang:1.20-bullseye as backendbuild
|
||||||
|
|
||||||
WORKDIR /go/src/github.com/analogj/scrutiny
|
WORKDIR /go/src/github.com/analogj/scrutiny
|
||||||
COPY . /go/src/github.com/analogj/scrutiny
|
COPY --link . /go/src/github.com/analogj/scrutiny
|
||||||
RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny
|
RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny
|
||||||
|
|
||||||
|
|
||||||
########
|
######## Combine build artifacts in runtime image
|
||||||
FROM debian:bullseye-slim as runtime
|
FROM debian:bullseye-slim as runtime
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
WORKDIR /opt/scrutiny
|
WORKDIR /opt/scrutiny
|
||||||
ENV PATH="/opt/scrutiny/bin:${PATH}"
|
ENV PATH="/opt/scrutiny/bin:${PATH}"
|
||||||
ENV INFLUXD_CONFIG_PATH=/opt/scrutiny/influxdb
|
ENV INFLUXD_CONFIG_PATH=/opt/scrutiny/influxdb
|
||||||
|
ENV S6VER="1.21.8.0"
|
||||||
|
ENV INFLUXVER="2.2.0"
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y cron smartmontools ca-certificates curl tzdata \
|
RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
|
||||||
|
apt-get install -y --no-install-recommends \
|
||||||
|
ca-certificates \
|
||||||
|
cron \
|
||||||
|
curl \
|
||||||
|
smartmontools \
|
||||||
|
tzdata \
|
||||||
&& update-ca-certificates \
|
&& update-ca-certificates \
|
||||||
&& case ${TARGETARCH} in \
|
&& case ${TARGETARCH} in \
|
||||||
"amd64") S6_ARCH=amd64 ;; \
|
"amd64") S6_ARCH=amd64 ;; \
|
||||||
"arm64") S6_ARCH=aarch64 ;; \
|
"arm64") S6_ARCH=aarch64 ;; \
|
||||||
esac \
|
esac \
|
||||||
&& curl https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \
|
&& curl https://github.com/just-containers/s6-overlay/releases/download/v${S6VER}/s6-overlay-${S6_ARCH}.tar.gz -L -s --output /tmp/s6-overlay-${S6_ARCH}.tar.gz \
|
||||||
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
|
&& tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
|
||||||
&& rm -rf /tmp/s6-overlay-${S6_ARCH}.tar.gz \
|
&& rm -rf /tmp/s6-overlay-${S6_ARCH}.tar.gz \
|
||||||
&& curl -L https://dl.influxdata.com/influxdb/releases/influxdb2-2.2.0-${TARGETARCH}.deb --output /tmp/influxdb2-2.2.0-${TARGETARCH}.deb \
|
&& curl -L https://dl.influxdata.com/influxdb/releases/influxdb2-${INFLUXVER}-${TARGETARCH}.deb --output /tmp/influxdb2-${INFLUXVER}-${TARGETARCH}.deb \
|
||||||
&& dpkg -i --force-all /tmp/influxdb2-2.2.0-${TARGETARCH}.deb
|
&& dpkg -i --force-all /tmp/influxdb2-${INFLUXVER}-${TARGETARCH}.deb \
|
||||||
|
&& rm -rf /tmp/influxdb2-2.2.0-${TARGETARCH}.deb
|
||||||
|
|
||||||
COPY /rootfs /
|
COPY /rootfs /
|
||||||
|
|
||||||
COPY /rootfs/etc/cron.d/scrutiny /etc/cron.d/scrutiny
|
COPY --link --from=backendbuild --chmod=755 /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
|
||||||
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
|
COPY --link --from=backendbuild --chmod=755 /go/src/github.com/analogj/scrutiny/scrutiny-collector-metrics /opt/scrutiny/bin/
|
||||||
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny-collector-metrics /opt/scrutiny/bin/
|
COPY --link --from=frontendbuild --chmod=644 /go/src/github.com/analogj/scrutiny/dist /opt/scrutiny/web
|
||||||
COPY dist /opt/scrutiny/web
|
RUN chmod 0644 /etc/cron.d/scrutiny && \
|
||||||
RUN chmod +x /opt/scrutiny/bin/scrutiny && \
|
|
||||||
chmod +x /opt/scrutiny/bin/scrutiny-collector-metrics && \
|
|
||||||
chmod 0644 /etc/cron.d/scrutiny && \
|
|
||||||
rm -f /etc/cron.daily/* && \
|
rm -f /etc/cron.daily/* && \
|
||||||
mkdir -p /opt/scrutiny/web && \
|
mkdir -p /opt/scrutiny/web && \
|
||||||
mkdir -p /opt/scrutiny/config && \
|
mkdir -p /opt/scrutiny/config && \
|
||||||
chmod -R ugo+rwx /opt/scrutiny/config
|
chmod -R ugo+rwx /opt/scrutiny/config
|
||||||
|
|
||||||
|
|
||||||
CMD ["/init"]
|
CMD ["/init"]
|
||||||
|
|||||||
+15
-10
@@ -1,20 +1,25 @@
|
|||||||
|
# syntax=docker/dockerfile:1.4
|
||||||
########################################################################################################################
|
########################################################################################################################
|
||||||
# Web Image
|
# Web Image
|
||||||
# NOTE: this image requires the `make binary-frontend` target to have been run before `docker build` The `dist` directory must exist.
|
|
||||||
########################################################################################################################
|
########################################################################################################################
|
||||||
|
|
||||||
|
######## Build the frontend
|
||||||
|
FROM --platform=${BUILDPLATFORM} node AS frontendbuild
|
||||||
|
WORKDIR /go/src/github.com/analogj/scrutiny
|
||||||
|
COPY --link . /go/src/github.com/analogj/scrutiny
|
||||||
|
|
||||||
########
|
RUN make binary-frontend
|
||||||
|
|
||||||
|
######## Build the backend
|
||||||
FROM golang:1.20-bullseye as backendbuild
|
FROM golang:1.20-bullseye as backendbuild
|
||||||
|
|
||||||
WORKDIR /go/src/github.com/analogj/scrutiny
|
WORKDIR /go/src/github.com/analogj/scrutiny
|
||||||
|
COPY --link . /go/src/github.com/analogj/scrutiny
|
||||||
COPY . /go/src/github.com/analogj/scrutiny
|
|
||||||
|
|
||||||
RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny
|
RUN make binary-clean binary-all WEB_BINARY_NAME=scrutiny
|
||||||
|
|
||||||
|
|
||||||
########
|
######## Combine build artifacts in runtime image
|
||||||
FROM debian:bullseye-slim as runtime
|
FROM debian:bullseye-slim as runtime
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
WORKDIR /opt/scrutiny
|
WORKDIR /opt/scrutiny
|
||||||
@@ -22,10 +27,10 @@ ENV PATH="/opt/scrutiny/bin:${PATH}"
|
|||||||
|
|
||||||
RUN apt-get update && apt-get install -y ca-certificates curl tzdata && update-ca-certificates
|
RUN apt-get update && apt-get install -y ca-certificates curl tzdata && update-ca-certificates
|
||||||
|
|
||||||
COPY --from=backendbuild /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
|
COPY --link --from=backendbuild --chmod=755 /go/src/github.com/analogj/scrutiny/scrutiny /opt/scrutiny/bin/
|
||||||
COPY dist /opt/scrutiny/web
|
COPY --link --from=frontendbuild --chmod=644 /go/src/github.com/analogj/scrutiny/dist /opt/scrutiny/web
|
||||||
RUN chmod +x /opt/scrutiny/bin/scrutiny && \
|
RUN mkdir -p /opt/scrutiny/web && \
|
||||||
mkdir -p /opt/scrutiny/web && \
|
|
||||||
mkdir -p /opt/scrutiny/config && \
|
mkdir -p /opt/scrutiny/config && \
|
||||||
chmod -R ugo+rwx /opt/scrutiny/config
|
chmod -R a+rX /opt/scrutiny && \
|
||||||
|
chmod -R a+w /opt/scrutiny/config
|
||||||
CMD ["/opt/scrutiny/bin/scrutiny", "start"]
|
CMD ["/opt/scrutiny/bin/scrutiny", "start"]
|
||||||
|
|||||||
@@ -104,3 +104,36 @@ You may also configure these values using the following environmental variables
|
|||||||
```
|
```
|
||||||
3. run `docker-compose up`
|
3. run `docker-compose up`
|
||||||
4. visit [http://localhost:9090/custom/web](http://localhost:9090/custom/web) - access the scrutiny container via caddy reverse proxy
|
4. visit [http://localhost:9090/custom/web](http://localhost:9090/custom/web) - access the scrutiny container via caddy reverse proxy
|
||||||
|
|
||||||
|
## Traefik
|
||||||
|
|
||||||
|
Assuming, that you have Traefik up and running with [AutoDiscovery Using Traefik For Docker ](https://doc.traefik.io/traefik/providers/docker/),
|
||||||
|
here is an example of a `docker-compose.yml` file, with labels to enable Traefik reverse proxy and basic auth
|
||||||
|
```yaml
|
||||||
|
version: '3.5'
|
||||||
|
services:
|
||||||
|
scrutiny:
|
||||||
|
container_name: scrutiny
|
||||||
|
image: ghcr.io/analogj/scrutiny:master-omnibus
|
||||||
|
cap_add:
|
||||||
|
- SYS_RAWIO
|
||||||
|
- SYS_ADMIN
|
||||||
|
volumes:
|
||||||
|
- /run/udev:/run/udev:ro
|
||||||
|
- ./config:/opt/scrutiny/config
|
||||||
|
- ./influxdb:/opt/scrutiny/influxdb
|
||||||
|
labels:
|
||||||
|
- traefik.enable=true
|
||||||
|
- traefik.http.routers.scrutiny.rule=Host(`example.com`)
|
||||||
|
- traefik.http.services.scrutiny.loadbalancer.server.port=8080
|
||||||
|
# 2 labels below are optional, in case you want basic auth in Traefik:
|
||||||
|
- traefik.http.routers.scrutiny.middlewares=auth
|
||||||
|
- "traefik.http.middlewares.auth.basicauth.users=user:$$2y$$05$$G11Wm/dlWpXHENK..m8se.zxvaE8USJBp1Ws56sSCrOcwWDjsYHni"
|
||||||
|
# Note: when used in docker-compose.yml all dollar signs in the hash need to be doubled for escaping.
|
||||||
|
# To create user:password pair, it's possible to use this command:
|
||||||
|
# echo $(htpasswd -nB user) | sed -e s/\\$/\\$\\$/g
|
||||||
|
devices:
|
||||||
|
- "/dev/sda"
|
||||||
|
- "/dev/sdb"
|
||||||
|
- "/dev/nvme0"
|
||||||
|
```
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ log:
|
|||||||
# - "pushbullet://api-token[/device/#channel/email]"
|
# - "pushbullet://api-token[/device/#channel/email]"
|
||||||
# - "ifttt://key/?events=event1[,event2,...]&value1=value1&value2=value2&value3=value3"
|
# - "ifttt://key/?events=event1[,event2,...]&value1=value1&value2=value2&value3=value3"
|
||||||
# - "mattermost://[username@]mattermost-host/token[/channel]"
|
# - "mattermost://[username@]mattermost-host/token[/channel]"
|
||||||
|
# - "ntfy://username:password@host:port/topic"
|
||||||
# - "hangouts://chat.googleapis.com/v1/spaces/FOO/messages?key=bar&token=baz"
|
# - "hangouts://chat.googleapis.com/v1/spaces/FOO/messages?key=bar&token=baz"
|
||||||
# - "zulip://bot-mail:bot-key@zulip-domain/?stream=name-or-id&topic=name"
|
# - "zulip://bot-mail:bot-key@zulip-domain/?stream=name-or-id&topic=name"
|
||||||
# - "join://shoutrrr:api-key@join/?devices=device1[,device2, ...][&icon=icon][&title=title]"
|
# - "join://shoutrrr:api-key@join/?devices=device1[,device2, ...][&icon=icon][&title=title]"
|
||||||
|
|||||||
@@ -4,30 +4,30 @@ go 1.20
|
|||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/analogj/go-util v0.0.0-20190301173314-5295e364eb14
|
github.com/analogj/go-util v0.0.0-20190301173314-5295e364eb14
|
||||||
github.com/containrrr/shoutrrr v0.6.1
|
github.com/containrrr/shoutrrr v0.7.1
|
||||||
github.com/fatih/color v1.10.0
|
github.com/fatih/color v1.15.0
|
||||||
github.com/gin-gonic/gin v1.6.3
|
github.com/gin-gonic/gin v1.6.3
|
||||||
github.com/glebarez/sqlite v1.4.5
|
github.com/glebarez/sqlite v1.4.5
|
||||||
github.com/go-gormigrate/gormigrate/v2 v2.0.0
|
github.com/go-gormigrate/gormigrate/v2 v2.0.0
|
||||||
github.com/golang/mock v1.4.3
|
github.com/golang/mock v1.6.0
|
||||||
github.com/influxdata/influxdb-client-go/v2 v2.9.0
|
github.com/influxdata/influxdb-client-go/v2 v2.9.0
|
||||||
github.com/jaypipes/ghw v0.6.1
|
github.com/jaypipes/ghw v0.6.1
|
||||||
github.com/mitchellh/mapstructure v1.2.2
|
github.com/mitchellh/mapstructure v1.5.0
|
||||||
github.com/samber/lo v1.25.0
|
github.com/samber/lo v1.25.0
|
||||||
github.com/sirupsen/logrus v1.4.2
|
github.com/sirupsen/logrus v1.6.0
|
||||||
github.com/spf13/viper v1.7.0
|
github.com/spf13/viper v1.14.0
|
||||||
github.com/stretchr/testify v1.7.1
|
github.com/stretchr/testify v1.8.1
|
||||||
github.com/urfave/cli/v2 v2.2.0
|
github.com/urfave/cli/v2 v2.2.0
|
||||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
|
golang.org/x/sync v0.1.0
|
||||||
gorm.io/gorm v1.23.5
|
gorm.io/gorm v1.23.5
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
|
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
|
||||||
github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
|
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/deepmap/oapi-codegen v1.8.2 // indirect
|
github.com/deepmap/oapi-codegen v1.8.2 // indirect
|
||||||
github.com/fsnotify/fsnotify v1.4.9 // indirect
|
github.com/fsnotify/fsnotify v1.6.0 // indirect
|
||||||
github.com/ghodss/yaml v1.0.0 // indirect
|
github.com/ghodss/yaml v1.0.0 // indirect
|
||||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||||
github.com/glebarez/go-sqlite v1.17.2 // indirect
|
github.com/glebarez/go-sqlite v1.17.2 // indirect
|
||||||
@@ -35,44 +35,45 @@ require (
|
|||||||
github.com/go-playground/locales v0.13.0 // indirect
|
github.com/go-playground/locales v0.13.0 // indirect
|
||||||
github.com/go-playground/universal-translator v0.17.0 // indirect
|
github.com/go-playground/universal-translator v0.17.0 // indirect
|
||||||
github.com/go-playground/validator/v10 v10.2.0 // indirect
|
github.com/go-playground/validator/v10 v10.2.0 // indirect
|
||||||
github.com/golang/protobuf v1.4.2 // indirect
|
github.com/golang/protobuf v1.5.2 // indirect
|
||||||
github.com/google/uuid v1.3.0 // indirect
|
github.com/google/uuid v1.3.0 // indirect
|
||||||
github.com/hashicorp/hcl v1.0.0 // indirect
|
github.com/hashicorp/hcl v1.0.0 // indirect
|
||||||
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
|
github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect
|
||||||
github.com/jaypipes/pcidb v0.5.0 // indirect
|
github.com/jaypipes/pcidb v0.5.0 // indirect
|
||||||
github.com/jinzhu/inflection v1.0.0 // indirect
|
github.com/jinzhu/inflection v1.0.0 // indirect
|
||||||
github.com/jinzhu/now v1.1.4 // indirect
|
github.com/jinzhu/now v1.1.4 // indirect
|
||||||
github.com/json-iterator/go v1.1.9 // indirect
|
github.com/json-iterator/go v1.1.12 // indirect
|
||||||
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
|
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
|
||||||
github.com/kvz/logstreamer v0.0.0-20201023134116-02d20f4338f5 // indirect
|
github.com/kvz/logstreamer v0.0.0-20201023134116-02d20f4338f5 // indirect
|
||||||
github.com/leodido/go-urn v1.2.0 // indirect
|
github.com/leodido/go-urn v1.2.0 // indirect
|
||||||
github.com/magiconair/properties v1.8.1 // indirect
|
github.com/magiconair/properties v1.8.6 // indirect
|
||||||
github.com/mattn/go-colorable v0.1.8 // indirect
|
github.com/mattn/go-colorable v0.1.13 // indirect
|
||||||
github.com/mattn/go-isatty v0.0.14 // indirect
|
github.com/mattn/go-isatty v0.0.18 // indirect
|
||||||
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
github.com/mitchellh/go-homedir v1.1.0 // indirect
|
||||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||||
github.com/modern-go/reflect2 v1.0.1 // indirect
|
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||||
github.com/pelletier/go-toml v1.7.0 // indirect
|
github.com/pelletier/go-toml v1.9.5 // indirect
|
||||||
|
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
|
||||||
github.com/pkg/errors v0.9.1 // indirect
|
github.com/pkg/errors v0.9.1 // indirect
|
||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
|
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
|
||||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||||
github.com/spf13/afero v1.2.2 // indirect
|
github.com/spf13/afero v1.9.2 // indirect
|
||||||
github.com/spf13/cast v1.3.1 // indirect
|
github.com/spf13/cast v1.5.0 // indirect
|
||||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||||
github.com/spf13/pflag v1.0.5 // indirect
|
github.com/spf13/pflag v1.0.5 // indirect
|
||||||
github.com/subosito/gotenv v1.2.0 // indirect
|
github.com/subosito/gotenv v1.4.1 // indirect
|
||||||
github.com/ugorji/go/codec v1.1.7 // indirect
|
github.com/ugorji/go/codec v1.1.7 // indirect
|
||||||
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad // indirect
|
golang.org/x/crypto v0.1.0 // indirect
|
||||||
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
|
golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
|
||||||
golang.org/x/net v0.0.0-20210119194325-5f4716e94777 // indirect
|
golang.org/x/net v0.1.0 // indirect
|
||||||
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 // indirect
|
golang.org/x/sys v0.7.0 // indirect
|
||||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
|
golang.org/x/term v0.1.0 // indirect
|
||||||
golang.org/x/text v0.3.5 // indirect
|
golang.org/x/text v0.4.0 // indirect
|
||||||
google.golang.org/protobuf v1.23.0 // indirect
|
google.golang.org/protobuf v1.28.1 // indirect
|
||||||
gopkg.in/ini.v1 v1.55.0 // indirect
|
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||||
gopkg.in/yaml.v2 v2.4.0 // indirect
|
gopkg.in/yaml.v2 v2.4.0 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
|
howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
|
||||||
modernc.org/libc v1.16.8 // indirect
|
modernc.org/libc v1.16.8 // indirect
|
||||||
modernc.org/mathutil v1.4.1 // indirect
|
modernc.org/mathutil v1.4.1 // indirect
|
||||||
|
|||||||
@@ -29,8 +29,14 @@ func main() {
|
|||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
configFilePath := "/opt/scrutiny/config/scrutiny.yaml"
|
||||||
|
configFilePathAlternative := "/opt/scrutiny/config/scrutiny.yml"
|
||||||
|
if !utils.FileExists(configFilePath) && utils.FileExists(configFilePathAlternative) {
|
||||||
|
configFilePath = configFilePathAlternative
|
||||||
|
}
|
||||||
|
|
||||||
//we're going to load the config file manually, since we need to validate it.
|
//we're going to load the config file manually, since we need to validate it.
|
||||||
err = config.ReadConfig("/opt/scrutiny/config/scrutiny.yaml") // Find and read the config file
|
err = config.ReadConfig(configFilePath) // Find and read the config file
|
||||||
if _, ok := err.(errors.ConfigFileMissingError); ok { // Handle errors reading the config file
|
if _, ok := err.(errors.ConfigFileMissingError); ok { // Handle errors reading the config file
|
||||||
//ignore "could not find config file"
|
//ignore "could not find config file"
|
||||||
} else if err != nil {
|
} else if err != nil {
|
||||||
|
|||||||
@@ -5,6 +5,13 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/analogj/go-util/utils"
|
"github.com/analogj/go-util/utils"
|
||||||
"github.com/analogj/scrutiny/webapp/backend/pkg"
|
"github.com/analogj/scrutiny/webapp/backend/pkg"
|
||||||
"github.com/analogj/scrutiny/webapp/backend/pkg/config"
|
"github.com/analogj/scrutiny/webapp/backend/pkg/config"
|
||||||
@@ -15,12 +22,6 @@ import (
|
|||||||
shoutrrrTypes "github.com/containrrr/shoutrrr/pkg/types"
|
shoutrrrTypes "github.com/containrrr/shoutrrr/pkg/types"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
"golang.org/x/sync/errgroup"
|
"golang.org/x/sync/errgroup"
|
||||||
"net/http"
|
|
||||||
"net/url"
|
|
||||||
"os"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const NotifyFailureTypeEmailTest = "EmailTest"
|
const NotifyFailureTypeEmailTest = "EmailTest"
|
||||||
@@ -386,6 +387,9 @@ func (n *Notify) GenShoutrrrNotificationParams(shoutrrrUrl string) (string, *sho
|
|||||||
case "join":
|
case "join":
|
||||||
(*params)["title"] = subject
|
(*params)["title"] = subject
|
||||||
(*params)["icon"] = logoUrl
|
(*params)["icon"] = logoUrl
|
||||||
|
case "ntfy":
|
||||||
|
(*params)["title"] = subject
|
||||||
|
(*params)["icon"] = logoUrl
|
||||||
case "opsgenie":
|
case "opsgenie":
|
||||||
(*params)["title"] = subject
|
(*params)["title"] = subject
|
||||||
case "pushbullet":
|
case "pushbullet":
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
package thresholds
|
package thresholds
|
||||||
|
|
||||||
|
import (
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
const AtaSmartAttributeDisplayTypeRaw = "raw"
|
const AtaSmartAttributeDisplayTypeRaw = "raw"
|
||||||
const AtaSmartAttributeDisplayTypeNormalized = "normalized"
|
const AtaSmartAttributeDisplayTypeNormalized = "normalized"
|
||||||
const AtaSmartAttributeDisplayTypeTransformed = "transformed"
|
const AtaSmartAttributeDisplayTypeTransformed = "transformed"
|
||||||
@@ -662,62 +667,84 @@ var AtaMetadata = map[int]AtaAttributeMetadata{
|
|||||||
188: {
|
188: {
|
||||||
ID: 188,
|
ID: 188,
|
||||||
DisplayName: "Command Timeout",
|
DisplayName: "Command Timeout",
|
||||||
DisplayType: AtaSmartAttributeDisplayTypeRaw,
|
DisplayType: AtaSmartAttributeDisplayTypeTransformed,
|
||||||
Ideal: ObservedThresholdIdealLow,
|
Ideal: ObservedThresholdIdealLow,
|
||||||
Critical: true,
|
Critical: true,
|
||||||
Description: "The count of aborted operations due to HDD timeout. Normally this attribute value should be equal to zero.",
|
Description: "The count of aborted operations due to HDD timeout. Normally this attribute value should be equal to zero.",
|
||||||
|
Transform: func(normValue int64, rawValue int64, rawString string) int64 {
|
||||||
|
// Parse Seagate command timeout values if the string contains 3 pieces
|
||||||
|
// and each piece is less than or equal to the next (as a sanity check)
|
||||||
|
// See https://github.com/AnalogJ/scrutiny/issues/522
|
||||||
|
pieces := strings.Split(rawString, " ")
|
||||||
|
if len(pieces) == 3 {
|
||||||
|
int_pieces := make([]int, len(pieces))
|
||||||
|
var err error
|
||||||
|
for i, s := range pieces {
|
||||||
|
int_pieces[i], err = strconv.Atoi(s)
|
||||||
|
if err != nil {
|
||||||
|
return rawValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if int_pieces[2] >= int_pieces[1] && int_pieces[1] >= int_pieces[0] {
|
||||||
|
return int64(int_pieces[2])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return rawValue
|
||||||
|
},
|
||||||
ObservedThresholds: []ObservedThreshold{
|
ObservedThresholds: []ObservedThreshold{
|
||||||
{
|
{
|
||||||
Low: 0,
|
Low: 0,
|
||||||
High: 0,
|
// This is set arbitrarily to avoid notifications caused by low
|
||||||
|
// historical numbers of command timeouts (e.g. caused by a bad cable)
|
||||||
|
High: 100,
|
||||||
AnnualFailureRate: 0.024893587674442153,
|
AnnualFailureRate: 0.024893587674442153,
|
||||||
ErrorInterval: []float64{0.020857343769186413, 0.0294830350167543},
|
ErrorInterval: []float64{0.020857343769186413, 0.0294830350167543},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 0,
|
Low: 100,
|
||||||
High: 13,
|
High: 13000000000,
|
||||||
AnnualFailureRate: 0.10044174089362015,
|
AnnualFailureRate: 0.10044174089362015,
|
||||||
ErrorInterval: []float64{0.0812633664077498, 0.1227848196758574},
|
ErrorInterval: []float64{0.0812633664077498, 0.1227848196758574},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 13,
|
Low: 13000000000,
|
||||||
High: 26,
|
High: 26000000000,
|
||||||
AnnualFailureRate: 0.334030592234279,
|
AnnualFailureRate: 0.334030592234279,
|
||||||
ErrorInterval: []float64{0.2523231196342665, 0.4337665082489293},
|
ErrorInterval: []float64{0.2523231196342665, 0.4337665082489293},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 26,
|
Low: 26000000000,
|
||||||
High: 39,
|
High: 39000000000,
|
||||||
AnnualFailureRate: 0.36724705400842445,
|
AnnualFailureRate: 0.36724705400842445,
|
||||||
ErrorInterval: []float64{0.30398009356575617, 0.4397986538328568},
|
ErrorInterval: []float64{0.30398009356575617, 0.4397986538328568},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 39,
|
Low: 39000000000,
|
||||||
High: 52,
|
High: 52000000000,
|
||||||
AnnualFailureRate: 0.29848155926978354,
|
AnnualFailureRate: 0.29848155926978354,
|
||||||
ErrorInterval: []float64{0.2509254838615984, 0.35242890006477073},
|
ErrorInterval: []float64{0.2509254838615984, 0.35242890006477073},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 52,
|
Low: 52000000000,
|
||||||
High: 65,
|
High: 65000000000,
|
||||||
AnnualFailureRate: 0.2203079701535098,
|
AnnualFailureRate: 0.2203079701535098,
|
||||||
ErrorInterval: []float64{0.18366082845676174, 0.26212468677179274},
|
ErrorInterval: []float64{0.18366082845676174, 0.26212468677179274},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 65,
|
Low: 65000000000,
|
||||||
High: 78,
|
High: 78000000000,
|
||||||
AnnualFailureRate: 0.3018169948863018,
|
AnnualFailureRate: 0.3018169948863018,
|
||||||
ErrorInterval: []float64{0.23779746376787655, 0.37776897542831006},
|
ErrorInterval: []float64{0.23779746376787655, 0.37776897542831006},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 78,
|
Low: 78000000000,
|
||||||
High: 91,
|
High: 91000000000,
|
||||||
AnnualFailureRate: 0.32854928239235887,
|
AnnualFailureRate: 0.32854928239235887,
|
||||||
ErrorInterval: []float64{0.2301118782147336, 0.4548506948185028},
|
ErrorInterval: []float64{0.2301118782147336, 0.4548506948185028},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Low: 91,
|
Low: 91000000000,
|
||||||
High: 104,
|
High: 104000000000,
|
||||||
AnnualFailureRate: 0.28488916640649387,
|
AnnualFailureRate: 0.28488916640649387,
|
||||||
ErrorInterval: []float64{0.1366154288236293, 0.5239213202729072},
|
ErrorInterval: []float64{0.1366154288236293, 0.5239213202729072},
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -2,4 +2,4 @@ package version
|
|||||||
|
|
||||||
// VERSION is the app-global version string, which will be replaced with a
|
// VERSION is the app-global version string, which will be replaced with a
|
||||||
// new value during packaging
|
// new value during packaging
|
||||||
const VERSION = "0.7.0"
|
const VERSION = "0.7.2"
|
||||||
|
|||||||
Reference in New Issue
Block a user