From 461a0eeea3a8a6b3783ef17c50286e44f9dc4f3e Mon Sep 17 00:00:00 2001 From: Michael Krieger Date: Thu, 16 Dec 2021 15:52:30 -0500 Subject: [PATCH 01/22] Permit the healthcheck to work if a BASE_PATH is set You can set the environment variable BASE_PATH=statping so that https://yoursite.domain:1234/statping/ is how the app is accessed. Note that a forward-slash is not used (which would otherwise allow just the variable to be dropped in). In order to do that, the healthcheck, which does not obey BASE_PATH, must be disabled. This should make it continue to work. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ca503f78..18aac4fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,9 +60,10 @@ ENV IS_DOCKER=true ENV SASS=/usr/local/bin/sassc ENV STATPING_DIR=/app ENV PORT=8080 +ENV BASE_PATH="" EXPOSE $PORT -HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD curl -s "http://localhost:$PORT/health" | jq -r -e ".online==true" +HEALTHCHECK --interval=60s --timeout=10s --retries=3 CMD if [ -z "$BASE_PATH" ]; then HEALTHPATH="/health"; else HEALTHPATH="/$BASE_PATH/health" ; fi && curl -s "http://localhost:80$HEALTHPATH" | jq -r -e ".online==true" CMD statping --port $PORT From e59fc1f5a5785c9d2e76c923545715ce36b49bce Mon Sep 17 00:00:00 2001 From: Dmitriy Date: Fri, 31 Dec 2021 13:48:40 +0300 Subject: [PATCH 02/22] Update russian.js Since Russian is my native language, I have corrected some incorrect phrases, declensions and cases to better display them in "statping-ng". --- frontend/src/languages/russian.js | 64 +++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/frontend/src/languages/russian.js b/frontend/src/languages/russian.js index 2b276258..90288d44 100644 --- a/frontend/src/languages/russian.js +++ b/frontend/src/languages/russian.js @@ -1,12 +1,12 @@ const russian = { settings: "Настройки", - dashboard: "Панель управления", - services: "служб", - service: "обслуживания", + dashboard: "Панель", + services: "Сервисы", + service: "Сервис", failures: "Сбои", users: "Пользователи", login: "Войти", - logout: "Выход из системы", + logout: "Выход", online: "Онлайн", offline: "Оффлайн", configs: "Конфигурация", @@ -22,33 +22,33 @@ const russian = { regen_api: "Регенерация ключей API", regen_desc: "API Secret используется для чтения создания обновлений и удаления маршрутов. Вы можете регенерировать ключи API, если вам нужно.", visibility: "Видимость", - group: "Группы", + group: "Группа", group_create: "Создать группу", group_update: "Обновить группу", - group_public_desc: "Показать групповые услуги публике", + group_public_desc: "Показавать группу публично всем", groups: "Группы", no_group: "Нет группы", - public: "Общественный", - private: "Частные", + public: "Публичный", + private: "Приватный", announcements: "Объявления", - notifiers: "Уведомлятели", + notifiers: "Способы уведомлений", logs: "Журналы", - help: "Помогите", + help: "Помощь", type: "Тип", edit: "Редактировать", update: "Обновить", - create: "Создайте", + create: "Создать", view: "Посмотреть", save: "Сохранить", title: "Название", - status: "положению", - begins: "Начинается", - total_services: "Всего услуг", + status: "Статус", + begins: "Начало", + total_services: "Всего сервисов", online_services: "Онлайн-сервисы", request_timeout: "Тайм-аут запроса", service_never_online: "Сервис никогда не был в сети", service_online_check: "Проверено онлайн", - service_offline_time: "Служба была отключена для", + service_offline_time: "Сервис был отключен для", days_ago: "Дней назад", today: "Сегодня", week: "Недели", @@ -57,7 +57,7 @@ const russian = { hour: "Час | Часов", minute: "Минута | Минуты", failures_24_hours: "Сбои за 24 часа", - no_services: "В настоящее время у вас нет услуг!", + no_services: "В настоящее время у вас нет сервисов!", theme: "Тема", cache: "Кэш", authentication: "Проверка подлинности", @@ -76,20 +76,20 @@ const russian = { db_password: "Пароль базы данных", db_database: "Имя базы данных", send_reports: "Отправка отчетов об ошибках", - send_reports_desc: "Отправить ошибки в Statping для отладки", + send_reports_desc: "Отправлять ошибки в Statping для отладки", project_name: "Имя страницы состояния", description: "Описание", domain: "Домен", enable_cdn: "Включить CDN", - newsletter: "Информационный бюллетень", - newsletter_note: "Мы отправим вам только сообщение по электронной почте для серьезных изменений", + newsletter: "Рассылка новостей", + newsletter_note: "Мы отправим вам электронное письмо только в случае серьезных изменений", loading: "Загрузка", save_settings: "Сохранить настройки", average_response: "Средний ответ", last_uptime: "Время безотказной работы", sign_in: "Войти", last_login: "Последний вход", - admin: "Администратор", + admin: "Админ", user: "Пользователя", failed: "Не удалось", wrong_login: "Неверное имя пользователя или пароль", @@ -99,7 +99,7 @@ const russian = { assets_btn: "Включить локальные ресурсы", assets_loading: "Создание компонентов", assets_dir: "Каталог активов", - footer: "Подколонтитул", + footer: "Нижний колонтитул (footer)", footer_notes: "Вы можете использовать HTML-теги в нижнем колонтитуле", global_announcement: "Глобальное объявление", announcement_date: "Диапазон дат объявления", @@ -114,29 +114,29 @@ const russian = { days: "Дни", user_create: "Создать пользователя", user_update: "Обновить пользователя", - administrator: "Администратора", - checkins: "Чеккинс", + administrator: "Администратор", + checkins: "Проверки", incidents: "Инциденты", service_info: "Информация о сервисе", - service_name: "Имя службы", - service_type: "Тип услуги", + service_name: "Имя сервиса", + service_type: "Тип сервиса", permalink: "URL-адрес Постоянной ссылки", - service_public: "Государственная служба", + service_public: "Видимость публично", check_interval: "Интервал проверки", - service_endpoint: "Конечная точка службы", - service_check: "Тип проверки службы", + service_endpoint: "Адрес проверяемого хоста", + service_check: "Тип проверки", service_timeout: "Тайм-аут запроса", expected_resp: "Ожидаемый ответ", expected_code: "Код ожидаемого состояния", - follow_redir: "Следуйте за перенаправленными", - verify_ssl: "Проверить SSL", + follow_redir: "Вкл. следование по редиректам", + verify_ssl: "Проверять SSL", tls_cert: "Использовать сертификат TLS", notification_opts: "Параметры уведомления", notifications_enable: "Включить уведомления", notify_after: "Уведомлять после сбоев", notify_all: "Уведомлять обо всех изменениях", - service_update: "Обновить службу", - service_create: "Создать службу" + service_update: "Обновить сервис", + service_create: "Создать сервис" } export default russian From 6071f4e96d956e2d5789fe606599c3dca8ffbf87 Mon Sep 17 00:00:00 2001 From: Thomas Wouters Date: Thu, 20 Jan 2022 18:46:47 +0100 Subject: [PATCH 03/22] Fix config directory permission validation Directories were reported as read-only as soon as the effective uid didn't the match directory owner. Rewrite permission validation to properly support UNIX permissions. Does not support for Access Control Lists. Fixes #87 --- utils/utils_custom.go | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/utils/utils_custom.go b/utils/utils_custom.go index 90253d60..bf9324ab 100644 --- a/utils/utils_custom.go +++ b/utils/utils_custom.go @@ -22,19 +22,35 @@ func DirWritable(path string) (bool, error) { return false, errors.New("path isn't a directory") } - if info.Mode().Perm()&(1<<(uint(7))) == 0 { - return false, errors.New("write permission bit is not set on this file for user") - } - var stat syscall.Stat_t if err = syscall.Stat(path, &stat); err != nil { return false, errors.New("unable to get stat") } - if uint32(os.Geteuid()) != stat.Uid { - return false, errors.New("user doesn't have permission to write to this directory") + if uint32(os.Geteuid()) == stat.Uid { + if info.Mode().Perm()&(1<<7) != 0 { + // owner matches and has write permissions + return true, nil + } else { + return false, errors.New("owner doesn't have write permissions for this path") + } } - return true, nil + + if uint32(os.Getegid()) == stat.Gid { + if info.Mode().Perm()&(1<<4) != 0 { + // group matches and has write permissions + return true, nil + } else { + return false, errors.New("group doesn't have write permissions for this path") + } + } + + if info.Mode().Perm()&(1<<1) != 0 { + // all users have write permissions + return true, nil + } + + return false, errors.New("user doesn't have write permissions for this path") } func Ping(address string, secondsTimeout int) (int64, error) { From 31ae62c6a0c1a930e9404208cc07e5cbf3e7c803 Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Mon, 24 Jan 2022 11:26:16 +0000 Subject: [PATCH 04/22] Updated changelog - ready to go unstable --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b80f70fe..5dc37530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# 0.90.79 (01-24-2022) +- Updated Russian Language - Thanks meatlayer +- Docker file fix for BASE_PATH and health checks - Thanks michaelkrieger +- Removed statping emailer notifier (not SMTP Mail) +- Fixes for notification failures (Issue statping#911) - Thanks glanchow +- Updated Home page uptime wording (24hr/7days) - Thanks Jonathanrbarney & thatInfrastructureGuy +- [GITHUB] Removed mailer tests + # 0.90.78 (09-15-2021) - HTTP Webhooks accept multiple HTTP Headers - Modified Telegram notifier to allow chat_ids From 4996b87d03580e5de745b072db9d91d075804e4e Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Tue, 25 Jan 2022 11:11:28 +0000 Subject: [PATCH 05/22] Version bump --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index d070d29d..482d5d86 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.79 +0.90.80 From f504deda3a1b8527115e01807625410a6e11168b Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Wed, 26 Jan 2022 16:49:42 +0000 Subject: [PATCH 06/22] Updated Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dc37530..08a08ecc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# 0.90.80 (01-26-2022) +- Fixed permissions on /app directory - Thanks twouters + # 0.90.79 (01-24-2022) - Updated Russian Language - Thanks meatlayer - Docker file fix for BASE_PATH and health checks - Thanks michaelkrieger From 40f31e3110550754a929a9f848c2eefa4df9ae3f Mon Sep 17 00:00:00 2001 From: Adam Boutcher Date: Thu, 27 Jan 2022 13:16:51 +0000 Subject: [PATCH 07/22] Version bump --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index 482d5d86..2b88209d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.80 +0.90.81 From 783b6180f7f93538fe0916471e38905cc636c88c Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 00:01:29 -0700 Subject: [PATCH 08/22] bump node,go,docker-compose versions build fixes mod updates --- .github/workflows/1_dev.yml | 12 +- .github/workflows/2_unstable.yml | 12 +- .github/workflows/3_stable.yml | 12 +- .github/workflows/pr.yml | 10 +- Dockerfile | 4 +- Dockerfile.base | 4 +- Makefile | 30 ++-- dev/docker-compose.full.m1.yml | 275 +++++++++++++++++++++++++++++++ dev/docker-compose.full.yml | 44 ++--- frontend/src/API.js | 4 +- frontend/vue.config.js | 10 +- go.mod | 129 +++++++++++++-- go.sum | 44 ++++- notifiers/generate.go | 1 + source/statping-ng.wiki | 1 + version.txt | 2 +- 16 files changed, 504 insertions(+), 90 deletions(-) create mode 100644 dev/docker-compose.full.m1.yml create mode 160000 source/statping-ng.wiki diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index bd650878..718a8a89 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -17,7 +17,7 @@ jobs: go-version: 1.15.x - uses: actions/setup-node@v1 with: - node-version: 12.18.2 + node-version: 16.14.0 - name: Set Version run: | @@ -210,7 +210,7 @@ jobs: go-version: 1.15.x - uses: actions/setup-node@v1 with: - node-version: 12.18.2 + node-version: 16.14.0 - name: Install Global Dependencies run: npm install -g yarn sass newman cross-env wait-on @sentry/cli @@ -218,7 +218,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -296,7 +296,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -350,7 +350,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -407,7 +407,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index a4150490..cc7c411f 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -17,7 +17,7 @@ jobs: go-version: 1.15.x - uses: actions/setup-node@v1 with: - node-version: 12.18.2 + node-version: 16.14.0 - name: Set Version run: | @@ -199,7 +199,7 @@ jobs: # go-version: 1.15.x # - uses: actions/setup-node@v1 # with: -# node-version: 12.18.2 +# node-version: 16.14.0 # - name: Install Global Dependencies # run: npm install -g yarn sass newman cross-env wait-on @sentry/cli @@ -207,7 +207,7 @@ jobs: # - name: Setting ENV's # run: | # echo "$(go env GOPATH)/bin" >> $GITHUB_PATH -# echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH +# echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH # echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV # shell: bash @@ -285,7 +285,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -339,7 +339,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -396,7 +396,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index 84b57059..b56f13cc 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -17,7 +17,7 @@ jobs: go-version: 1.15.x - uses: actions/setup-node@v1 with: - node-version: 12.18.2 + node-version: 16.14.0 - name: Set Version run: | @@ -222,7 +222,7 @@ jobs: # go-version: 1.15.x # - uses: actions/setup-node@v1 # with: -# node-version: 12.18.2 +# node-version: 16.14.0 # # - name: Install Global Dependencies # run: npm install -g yarn sass newman cross-env wait-on @sentry/cli @@ -230,7 +230,7 @@ jobs: # - name: Setting ENV's # run: | # echo "$(go env GOPATH)/bin" >> $GITHUB_PATH -# echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH +# echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH # echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV # shell: bash # @@ -308,7 +308,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -362,7 +362,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -419,7 +419,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 02777270..30cd68c1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,10 +20,10 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.14.2' + go-version: '1.17.8' - uses: actions/setup-node@v1 with: - node-version: '12.18.2' + node-version: '16.14.0' - uses: actions/checkout@v2 - name: Add GOBIN to PATH @@ -86,7 +86,7 @@ jobs: go-version: 1.15.x - uses: actions/setup-node@v1 with: - node-version: 12.18.2 + node-version: 16.14.0 - uses: actions/checkout@v2 - name: Install Global Dependencies @@ -97,7 +97,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash @@ -140,7 +140,7 @@ jobs: - name: Setting ENV's run: | echo "$(go env GOPATH)/bin" >> $GITHUB_PATH - echo "/opt/hostedtoolcache/node/12.18.2/x64/bin" >> $GITHUB_PATH + echo "/opt/hostedtoolcache/node/16.14.0/x64/bin" >> $GITHUB_PATH echo "VERSION=$(cat version.txt)" >> $GITHUB_ENV shell: bash diff --git a/Dockerfile b/Dockerfile index 18aac4fc..6997cc18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.18.2-alpine AS frontend +FROM node:16.14.0-alpine AS frontend LABEL maintainer="Statping-ng (https://github.com/statping-ng)" ARG BUILDPLATFORM WORKDIR /statping @@ -10,7 +10,7 @@ RUN yarn build && yarn cache clean # Statping Golang BACKEND building from source # Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying -FROM golang:1.14-alpine AS backend +FROM golang:1.17-alpine AS backend LABEL maintainer="Statping-NG (https://github.com/statping-ng)" ARG VERSION ARG COMMIT diff --git a/Dockerfile.base b/Dockerfile.base index e451d2f1..920b20f5 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -1,4 +1,4 @@ -FROM node:12.18.2-alpine AS frontend +FROM node:16.14.0-alpine AS frontend LABEL maintainer="Statping-ng (https://github.com/statping-ng)" ARG BUILDPLATFORM WORKDIR /statping @@ -10,7 +10,7 @@ RUN yarn build && yarn cache clean # Statping Golang BACKEND building from source # Creates "/go/bin/statping" and "/usr/local/bin/sass" for copying -FROM golang:1.14-alpine AS backend +FROM golang:1.17-alpine AS backend LABEL maintainer="Statping-NG (https://github.com/statping-ng)" ARG VERSION ARG COMMIT diff --git a/Makefile b/Makefile index 04ae8c6f..54bcbb90 100644 --- a/Makefile +++ b/Makefile @@ -3,13 +3,13 @@ COMMIT=$(shell git rev-parse HEAD) SIGN_KEY=B76D61FAA6DB759466E83D9964B9C6AAE2D55278 BINARY_NAME=statping GOBUILD=go build -a -GOVERSION=1.14.0 -NODE_VERSION=12.18.2 +GOVERSION=1.17.8 +NODE_VERSION=16.14.0 XGO=xgo -go $(GOVERSION) --dest=build BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" TRVIS_SECRET=O3/2KTOV8krv+yZ1EB/7D1RQRe6NdpFUEJNJkMS/ollYqmz3x2mCO7yIgIJKCKguLXZxjM6CxJcjlCrvUwibL+8BBp7xJe4XFIOrjkPvbbVPry4HkFZCf2GfcUK6o4AByQ+RYqsW2F17Fp9KLQ1rL3OT3eLTwCAGKx3tlY8y+an43zkmo5dN64V6sawx26fh6XTfww590ey+ltgQTjf8UPNup2wZmGvMo9Hwvh/bYR/47bR6PlBh6vhlKWyotKf2Fz1Bevbu0zc35pee5YlsrHR+oSF+/nNd/dOij34BhtqQikUR+zQVy9yty8SlmneVwD3yOENvlF+8roeKIXb6P6eZnSMHvelhWpAFTwDXq2N3d/FIgrQtLxsAFTI3nTHvZgs6OoTd6dA0wkhuIGLxaL3FOeztCdxP5J/CQ9GUcTvifh5ArGGwYxRxQU6rTgtebJcNtXFISP9CEUR6rwRtb6ax7h6f1SbjUGAdxt+r2LbEVEk4ZlwHvdJ2DtzJHT5DQtLrqq/CTUgJ8SJFMkrJMp/pPznKhzN4qvd8oQJXygSXX/gz92MvoX0xgpNeLsUdAn+PL9KketfR+QYosBz04d8k05E+aTqGaU7FUCHPTLwlOFvLD8Gbv0zsC/PWgSLXTBlcqLEz5PHwPVHTcVzspKj/IyYimXpCSbvu1YOIjyc= PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }' -TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "merge_mode": "replace", "language": "go", "go": 1.14, "install": true, "sudo": "required", "services": ["docker"], "env": { "secure": "${TRVIS_SECRET}" }, "before_deploy": ["git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [{ "provider": "releases", "api_key": "$$GITHUB_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": { "branch": "master" } }], "before_script": ["rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable", "nvm install 10.17.0", "nvm use 10.17.0 --default", "npm install -g sass yarn cross-env", "pip install --user awscli"], "script": ["make release"], "after_success": [], "after_deploy": ["make post-release"] } } }' +TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "merge_mode": "replace", "language": "go", "go": 1.17, "install": true, "sudo": "required", "services": ["docker"], "env": { "secure": "${TRVIS_SECRET}" }, "before_deploy": ["git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [{ "provider": "releases", "api_key": "$$GITHUB_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": { "branch": "master" } }], "before_script": ["rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install stable", "nvm install 16.14.0", "nvm use 16.14.0 --default", "npm install -g sass yarn cross-env", "pip install --user awscli"], "script": ["make release"], "after_success": [], "after_deploy": ["make post-release"] } } }' TEST_DIR=$(GOPATH)/src/github.com/statping-ng/statping-ng PATH:=$(GOPATH)/bin:$(PATH) OS = freebsd linux openbsd @@ -37,16 +37,16 @@ lint: goimports ./... up: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml up -d --remove-orphans + docker compose -f docker compose.yml -f dev/docker compose.full.yml up -d --remove-orphans make print_details down: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml down --volumes --remove-orphans + docker compose -f docker compose.yml -f dev/docker compose.full.yml down --volumes --remove-orphans lite: clean docker build -t statping-ng/statping-ng:dev -f dev/Dockerfile.dev . - docker-compose -f dev/docker-compose.lite.yml down - docker-compose -f dev/docker-compose.lite.yml up --remove-orphans + docker compose -f dev/docker compose.lite.yml down + docker compose -f dev/docker compose.lite.yml up --remove-orphans reup: down clean compose-build-full up @@ -94,37 +94,37 @@ go-run: go run ./cmd start: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml start + docker compose -f docker compose.yml -f dev/docker compose.full.yml start stop: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml stop + docker compose -f docker compose.yml -f dev/docker compose.full.yml stop logs: docker logs statping --follow db-up: - docker-compose -f dev/docker-compose.db.yml up -d --remove-orphans + docker compose -f dev/docker compose.db.yml up -d --remove-orphans db-down: - docker-compose -f dev/docker-compose.db.yml down --volumes --remove-orphans + docker compose -f dev/docker compose.db.yml down --volumes --remove-orphans console: docker exec -t -i statping /bin/sh compose-build-full: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION} + docker compose -f docker compose.yml -f dev/docker compose.full.yml build --parallel --build-arg VERSION=${VERSION} docker-latest: docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} . docker-test: - docker-compose -f docker-compose.test.yml up --remove-orphans + docker compose -f docker compose.test.yml up --remove-orphans modd: modd -f ./dev/modd.conf top: - docker-compose -f docker-compose.yml -f dev/docker-compose.full.yml top + docker compose -f docker compose.yml -f dev/docker compose.full.yml top frontend-build: @echo "Removing old frontend distributions..." @@ -382,7 +382,7 @@ delve: check: @echo "Checking the programs required for the build are installed..." - @echo "go: $(shell go version) - $(shell which go)" && go version >/dev/null 2>&1 || (echo "ERROR: go 1.14 is required."; exit 1) + @echo "go: $(shell go version) - $(shell which go)" && go version >/dev/null 2>&1 || (echo "ERROR: go 1.17 is required."; exit 1) @echo "node: $(shell node --version) - $(shell which node)" && node --version >/dev/null 2>&1 || (echo "ERROR: node 12.x is required."; exit 1) @echo "yarn: $(shell yarn --version) - $(shell which yarn)" && yarn --version >/dev/null 2>&1 || (echo "ERROR: yarn is required."; exit 1) @echo "All required programs are installed!" diff --git a/dev/docker-compose.full.m1.yml b/dev/docker-compose.full.m1.yml new file mode 100644 index 00000000..8f38b386 --- /dev/null +++ b/dev/docker-compose.full.m1.yml @@ -0,0 +1,275 @@ +version: '2.3' + + +############################################### +# Statping Full Stack +# +# Statping SQLIte => http://localhost:8080 +# Statping MySQL => http://localhost:8081 +# Statping Postgres => http://localhost:8082 +# Statping MariaDB => http://localhost:8083 +# +# Adminer => http://localhost:8282 +# Prometheus => http://localhost:7050 +# Grafana => http://localhost:3000 +# +# MySQL => http://localhost:3306 +# Postgres => http://localhost:5432 +# MariaDB => http://localhost:3307 +# +############################################### + +services: + + statping_sqlite: + container_name: statping_sqlite + platform: linux/amd64 + build: + context: ./ + restart: on-failure + volumes: + - ./dev/docker/statping/sqlite:/app + - ./dev/services.yml:/app/services.yml + environment: + DB_CONN: sqlite + API_SECRET: exampleapisecret + NAME: Statping + DOMAIN: http://localhost:8084 + DESCRIPTION: This is a dev environment on SQLite! + ADMIN_USER: admin + ADMIN_PASSWORD: admin + SAMPLE_DATA: 'false' + ports: + - 8084:8080 + networks: + - database + - frontend + healthcheck: + test: ["CMD-SHELL", "curl -f http://localhost:8080/health || false"] + timeout: 2s + interval: 10s + retries: 20 + + statping_mysql: + container_name: statping_mysql + platform: linux/amd64 + build: + context: ./ + restart: on-failure + volumes: + - ./dev/docker/statping/mysql:/app + - ./dev/services.yml:/app/services.yml + environment: + DB_CONN: mysql + DB_HOST: mysql + DB_USER: root + DB_PASS: password123 + DB_DATABASE: statping + DB_PORT: 3306 + API_SECRET: exampleapisecret + NAME: Statping MySQL + DOMAIN: http://localhost:8081 + DESCRIPTION: This is a dev environment on MySQL! + ADMIN_USER: admin + ADMIN_PASSWORD: admin + SAMPLE_DATA: 'false' + ports: + - 8081:8080 + networks: + - database + - frontend + healthcheck: + test: ["CMD-SHELL", "curl -f http://localhost:8080/health || false"] + timeout: 2s + interval: 10s + retries: 20 + depends_on: + mysql: + condition: service_healthy + + statping_postgres: + container_name: statping_postgres + platform: linux/amd64 + build: + context: ./ + restart: on-failure + volumes: + - ./dev/docker/statping/mysql:/app + - ./dev/services.yml:/app/services.yml + environment: + DB_CONN: postgres + DB_HOST: postgres + DB_USER: root + DB_PASS: password123 + DB_DATABASE: statping + DB_PORT: 5432 + API_SECRET: exampleapisecret + NAME: Statping Postgres + DOMAIN: http://localhost:8082 + DESCRIPTION: This is a dev environment on Postgres! + ADMIN_USER: admin + ADMIN_PASSWORD: admin + SAMPLE_DATA: 'false' + ports: + - 8082:8080 + networks: + - database + - frontend + healthcheck: + test: ["CMD-SHELL", "curl -f http://localhost:8080/health || false"] + timeout: 2s + interval: 10s + retries: 20 + depends_on: + postgres: + condition: service_healthy + + statping_mariadb: + container_name: statping_mariadb + platform: linux/amd64 + build: + context: ./ + restart: on-failure + volumes: + - ./dev/docker/statping/mariadb:/app + - ./dev/services.yml:/app/services.yml + environment: + DB_CONN: mysql + DB_HOST: mariadb + DB_USER: root + DB_PASS: password123 + DB_DATABASE: statping + DB_PORT: 3306 + API_SECRET: exampleapisecret + NAME: Statping MariaDB + DOMAIN: http://localhost:8083 + DESCRIPTION: This is a dev environment on MariaDB! + ADMIN_USER: admin + ADMIN_PASSWORD: admin + SAMPLE_DATA: 'false' + ports: + - 8083:8080 + networks: + - database + - frontend + healthcheck: + test: ["CMD-SHELL", "curl -f http://localhost:8080/health || false"] + timeout: 2s + interval: 10s + retries: 20 + depends_on: + mariadb: + condition: service_healthy + + postgres: + container_name: postgres + image: postgres + volumes: + - ./dev/docker/databases/postgres:/var/lib/postgresql/data + ports: + - 5432:5432 + environment: + POSTGRES_PASSWORD: password123 + POSTGRES_DB: statping + POSTGRES_USER: root + networks: + - database + healthcheck: + test: ["CMD-SHELL", "pg_isready -U root"] + interval: 15s + timeout: 10s + retries: 20 + + mysql: + container_name: mysql + image: mysql:5.7 + volumes: + - ./dev/docker/databases/mysql:/var/lib/mysql + restart: always + environment: + MYSQL_ROOT_PASSWORD: password123 + MYSQL_DATABASE: statping + ports: + - 3306:3306 + networks: + - database + healthcheck: + test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] + timeout: 20s + interval: 15s + retries: 30 + + mariadb: + container_name: mariadb + image: mariadb + volumes: + - ./dev/docker/databases/mariadb:/var/lib/mysql + restart: always + environment: + MYSQL_ROOT_PASSWORD: password123 + MYSQL_DATABASE: statping + ports: + - 3307:3306 + networks: + - database + healthcheck: + test: [ "CMD", "mysqladmin" ,"ping", "-h", "localhost" ] + timeout: 20s + interval: 15s + retries: 30 + + adminer: + container_name: adminer + image: adminer + restart: always + networks: + - database + - frontend + ports: + - 8282:8080 + + prometheus: + container_name: prometheus + platform: linux/amd64 + image: prom/prometheus:v2.0.0 + restart: on-failure + volumes: + - ./dev/prometheus.yml:/etc/prometheus/prometheus.yml + - ./dev/docker/databases/prometheus:/prometheus + ports: + - 7050:9090 + networks: + - database + healthcheck: + test: "/bin/wget -q -Y off http://localhost:9090/status -O /dev/null > /dev/null 2>&1" + interval: 10s + timeout: 3s + + grafana: + container_name: grafana + image: grafana/grafana + restart: on-failure + ports: + - 3000:3000 + volumes: + - ./dev/docker/grafana:/var/lib/grafana + - ./dev/grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml + - ./dev/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml + - ./dev/grafana/statping_dashboard.json:/etc/grafana/provisioning/dashboards/statping_dashboard.json + environment: + - GF_USERS_ALLOW_SIGN_UP=false + - GF_AUTH_ANONYMOUS_ENABLED=true + depends_on: + prometheus: + condition: service_healthy + networks: + - frontend + - database + healthcheck: + test: "/usr/bin/wget -q -Y off http://localhost:3000/api/health -O /dev/null > /dev/null 2>&1" + interval: 10s + retries: 20 + +networks: + frontend: + database: diff --git a/dev/docker-compose.full.yml b/dev/docker-compose.full.yml index 740c75b8..fde6b0bb 100644 --- a/dev/docker-compose.full.yml +++ b/dev/docker-compose.full.yml @@ -24,11 +24,11 @@ services: statping_sqlite: container_name: statping_sqlite build: - context: ../ + context: ./ restart: on-failure volumes: - - ./docker/statping/sqlite:/app - - ./services.yml:/app/services.yml + - ./dev/docker/statping/sqlite:/app + - ./dev/services.yml:/app/services.yml environment: DB_CONN: sqlite API_SECRET: exampleapisecret @@ -39,7 +39,7 @@ services: ADMIN_PASSWORD: admin SAMPLE_DATA: 'false' ports: - - 8080:8080 + - 8084:8080 networks: - database - frontend @@ -52,11 +52,11 @@ services: statping_mysql: container_name: statping_mysql build: - context: ../ + context: ./ restart: on-failure volumes: - - ./docker/statping/mysql:/app - - ./services.yml:/app/services.yml + - ./dev/docker/statping/mysql:/app + - ./dev/services.yml:/app/services.yml environment: DB_CONN: mysql DB_HOST: mysql @@ -88,11 +88,11 @@ services: statping_postgres: container_name: statping_postgres build: - context: ../ + context: ./ restart: on-failure volumes: - - ./docker/statping/mysql:/app - - ./services.yml:/app/services.yml + - ./dev/docker/statping/mysql:/app + - ./dev/services.yml:/app/services.yml environment: DB_CONN: postgres DB_HOST: postgres @@ -124,11 +124,11 @@ services: statping_mariadb: container_name: statping_mariadb build: - context: ../ + context: ./ restart: on-failure volumes: - - ./docker/statping/mariadb:/app - - ./services.yml:/app/services.yml + - ./dev/docker/statping/mariadb:/app + - ./dev/services.yml:/app/services.yml environment: DB_CONN: mysql DB_HOST: mariadb @@ -161,7 +161,7 @@ services: container_name: postgres image: postgres volumes: - - ./docker/databases/postgres:/var/lib/postgresql/data + - ./dev/docker/databases/postgres:/var/lib/postgresql/data ports: - 5432:5432 environment: @@ -180,7 +180,7 @@ services: container_name: mysql image: mysql:5.7 volumes: - - ./docker/databases/mysql:/var/lib/mysql + - ./dev/docker/databases/mysql:/var/lib/mysql restart: always environment: MYSQL_ROOT_PASSWORD: password123 @@ -201,7 +201,7 @@ services: container_name: mariadb image: mariadb volumes: - - ./docker/databases/mariadb:/var/lib/mysql + - ./dev/docker/databases/mariadb:/var/lib/mysql restart: always environment: MYSQL_ROOT_PASSWORD: password123 @@ -233,8 +233,8 @@ services: image: prom/prometheus:v2.0.0 restart: on-failure volumes: - - ./prometheus.yml:/etc/prometheus/prometheus.yml - - ./docker/databases/prometheus:/prometheus + - ./dev/prometheus.yml:/etc/prometheus/prometheus.yml + - ./dev/docker/databases/prometheus:/prometheus ports: - 7050:9090 networks: @@ -251,10 +251,10 @@ services: ports: - 3000:3000 volumes: - - ./docker/grafana:/var/lib/grafana - - ./grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml - - ./grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml - - ./grafana/statping_dashboard.json:/etc/grafana/provisioning/dashboards/statping_dashboard.json + - ./dev/docker/grafana:/var/lib/grafana + - ./dev/grafana/datasource.yml:/etc/grafana/provisioning/datasources/datasource.yml + - ./dev/grafana/dashboard.yml:/etc/grafana/provisioning/dashboards/dashboard.yml + - ./dev/grafana/statping_dashboard.json:/etc/grafana/provisioning/dashboards/statping_dashboard.json environment: - GF_USERS_ALLOW_SIGN_UP=false - GF_AUTH_ANONYMOUS_ENABLED=true diff --git a/frontend/src/API.js b/frontend/src/API.js index 3e62d295..ffafade6 100644 --- a/frontend/src/API.js +++ b/frontend/src/API.js @@ -7,8 +7,8 @@ const tokenKey = "statping_auth"; class Api { constructor() { - this.version = "0.90.74"; - this.commit = "df8e1f73d9f7fdf218bc5c26130d7d8a6af6719a"; + this.version = "0.91.0"; + this.commit = "40f31e3110550754a929a9f848c2eefa4df9ae3f"; } async oauth() { diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 8a3ee963..4887eb6c 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -1,13 +1,13 @@ module.exports = { - baseUrl: '/', + publicPath: '/', assetsDir: 'assets', filenameHashing: false, - productionTip: process.env.NODE_ENV !== 'production', - devtools: process.env.NODE_ENV !== 'production', - performance: process.env.NODE_ENV !== 'production', + // productionTip: process.env.NODE_ENV !== 'production', + // devtools: process.env.NODE_ENV !== 'production', + // performance: process.env.NODE_ENV !== 'production', devServer: { disableHostCheck: true, - proxyTable: { + proxy: { '/api': { logLevel: 'debug', target: 'http://0.0.0.0:8585', diff --git a/go.mod b/go.mod index 1ef350e1..9137a196 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,10 @@ module github.com/statping-ng/statping-ng -// +heroku goVersion go1.14 -go 1.14 +// +heroku goVersion go1.17 +go 1.17 require ( - github.com/GeertJohan/go.rice v1.0.0 + github.com/GeertJohan/go.rice v1.0.2 github.com/aws/aws-sdk-go v1.30.20 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/fatih/structs v1.1.0 @@ -12,8 +12,6 @@ require ( github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9 github.com/getsentry/sentry-go v0.5.1 github.com/go-mail/mail v2.3.1+incompatible - github.com/golang/protobuf v1.4.2 // indirect - github.com/google/go-cmp v0.5.1 // indirect github.com/gorilla/mux v1.7.4 github.com/hako/durafmt v0.0.0-20200605151348-3a43fc422dd9 github.com/jinzhu/gorm v1.9.12 @@ -24,19 +22,124 @@ require ( github.com/spf13/cobra v1.0.0 github.com/spf13/viper v1.6.3 github.com/statping-ng/emails v1.0.3 - github.com/stretchr/objx v0.2.0 // indirect github.com/stretchr/testify v1.6.1 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 - go.uber.org/atomic v1.6.0 // indirect golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 - golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 // indirect - golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d - golang.org/x/text v0.3.3 // indirect - golang.org/x/tools v0.0.0-20201012192620-5bd05386311b // indirect - google.golang.org/appengine v1.6.6 // indirect google.golang.org/grpc v1.28.1 - google.golang.org/protobuf v1.25.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.3.0 ) + +require ( + cloud.google.com/go v0.56.0 // indirect + github.com/Azure/azure-sdk-for-go v41.3.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.10.0 // indirect + github.com/Azure/go-autorest/autorest/adal v0.8.3 // indirect + github.com/Azure/go-autorest/autorest/azure/auth v0.4.2 // indirect + github.com/Azure/go-autorest/autorest/azure/cli v0.3.1 // indirect + github.com/Azure/go-autorest/autorest/date v0.2.0 // indirect + github.com/Azure/go-autorest/autorest/to v0.3.0 // indirect + github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.1.0 // indirect + github.com/Azure/go-autorest/tracing v0.5.0 // indirect + github.com/GeertJohan/go.incremental v1.0.0 // indirect + github.com/OpenDNS/vegadns2client v0.0.0-20180418235048-a3fa4a771d87 // indirect + github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11 // indirect + github.com/akavel/rsrc v0.8.0 // indirect + github.com/aliyun/alibaba-cloud-sdk-go v1.61.131 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cenkalti/backoff/v4 v4.0.2 // indirect + github.com/cloudflare/cloudflare-go v0.11.6 // indirect + github.com/cpu/goacmedns v0.0.2 // indirect + github.com/daaku/go.zipexe v1.0.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dimchansky/utfbom v1.1.0 // indirect + github.com/dnsimple/dnsimple-go v0.60.0 // indirect + github.com/exoscale/egoscale v0.18.1 // indirect + github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/go-acme/lego/v3 v3.7.0 // indirect + github.com/go-errors/errors v1.0.2 // indirect + github.com/go-resty/resty/v2 v2.2.0 // indirect + github.com/go-sql-driver/mysql v1.5.0 // indirect + github.com/gofrs/uuid v3.2.0+incompatible // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.4.2 // indirect + github.com/gomarkdown/markdown v0.0.0-20220306001849-6e467e7bd3e8 // indirect + github.com/gomarkdown/mdtohtml v0.0.0-20180202094705-7346712f31b4 // indirect + github.com/google/go-querystring v1.0.0 // indirect + github.com/google/uuid v1.1.1 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/gophercloud/gophercloud v0.10.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.1 // indirect + github.com/hashicorp/go-retryablehttp v0.6.6 // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/iij/doapi v0.0.0-20190504054126-0bbf12d6d7df // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jessevdk/go-flags v1.4.0 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jmespath/go-jmespath v0.3.0 // indirect + github.com/json-iterator/go v1.1.9 // indirect + github.com/kolo/xmlrpc v0.0.0-20200310150728-e0350524596b // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect + github.com/labbsr0x/bindman-dns-webhook v1.0.2 // indirect + github.com/labbsr0x/goh v1.0.1 // indirect + github.com/lextoumbourou/goodhosts v2.1.0+incompatible // indirect + github.com/lib/pq v1.3.0 // indirect + github.com/linode/linodego v0.14.0 // indirect + github.com/liquidweb/liquidweb-go v1.6.1 // indirect + github.com/magiconair/properties v1.8.1 // indirect + github.com/mattn/goveralls v0.0.11 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/miekg/dns v1.1.29 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.2.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04 // indirect + github.com/nkovacs/streamquote v1.0.0 // indirect + github.com/nrdcg/auroradns v1.0.1 // indirect + github.com/nrdcg/dnspod-go v0.4.0 // indirect + github.com/nrdcg/goinwx v0.6.1 // indirect + github.com/nrdcg/namesilo v0.2.1 // indirect + github.com/oracle/oci-go-sdk v17.4.0+incompatible // indirect + github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014 // indirect + github.com/patrickmn/go-cache v2.1.0+incompatible // indirect + github.com/pelletier/go-toml v1.7.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4 // indirect + github.com/prometheus/common v0.6.0 // indirect + github.com/prometheus/procfs v0.0.3 // indirect + github.com/sacloud/libsacloud v1.36.1 // indirect + github.com/spf13/afero v1.2.2 // indirect + github.com/spf13/cast v1.3.1 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tdewolff/minify/v2 v2.10.0 // indirect + github.com/tdewolff/parse/v2 v2.5.27 // indirect + github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7 // indirect + github.com/transip/gotransip/v6 v6.0.2 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.0.1 // indirect + github.com/vultr/govultr v0.3.3 // indirect + github.com/wellington/go-libsass v0.9.2 // indirect + go.opencensus.io v0.22.3 // indirect + go.uber.org/ratelimit v0.1.0 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 // indirect + golang.org/x/tools v0.1.9 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + google.golang.org/api v0.21.0 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/protobuf v1.25.0 // indirect + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/ini.v1 v1.55.0 // indirect + gopkg.in/ns1/ns1-go.v2 v2.3.0 // indirect + gopkg.in/square/go-jose.v2 v2.5.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect +) diff --git a/go.sum b/go.sum index 231daf1e..f39f9d55 100755 --- a/go.sum +++ b/go.sum @@ -73,9 +73,11 @@ github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EF github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= github.com/DATA-DOG/go-sqlmock v1.4.1 h1:ThlnYciV1iM/V0OSF/dtkqWb6xo5qITT1TJBG1MRDJM= github.com/DATA-DOG/go-sqlmock v1.4.1/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/GeertJohan/go.incremental v1.0.0 h1:7AH+pY1XUgQE4Y1HcXYaMqAI0m9yrFqo/jt0CW30vsg= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= -github.com/GeertJohan/go.rice v1.0.0 h1:KkI6O9uMaQU3VEKaj01ulavtF7o1fWT7+pk/4voiMLQ= github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= +github.com/GeertJohan/go.rice v1.0.2 h1:PtRw+Tg3oa3HYwiDBZyvOJ8LdIyf6lAovJJtr7YOAYk= +github.com/GeertJohan/go.rice v1.0.2/go.mod h1:af5vUNlDNkCjOZeSGFgIJxDje9qdjsO6hshx0gTmZt4= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -88,6 +90,7 @@ github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.8/go.mod h1:aVvklgKsPENRkl29bNwrHISa1F+YLGTHArMxZMBqWM8= github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11 h1:QGjNHMwoPYxE5NpOAc8kpd2KTY293/oFk5BWdjkza+k= github.com/akamai/AkamaiOPEN-edgegrid-golang v0.9.11/go.mod h1:L+HB2uBoDgi3+r1pJEJcbGwyyHhd2QXaGsKLbDwtm8Q= +github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw= github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -147,6 +150,7 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUn github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dimchansky/utfbom v1.1.0 h1:FcM3g+nofKgUteL8dm/UpdRXNC9KmADgTpLKsu0TRo4= github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8= +github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE= github.com/dnaeon/go-vcr v0.0.0-20180814043457-aafff18a5cc2/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/dnsimple/dnsimple-go v0.60.0 h1:N+q+ML1CZGf+5r4udu9Opy7WJNtOaFT9aM86Af9gLhk= @@ -176,6 +180,8 @@ github.com/foomo/tlsconfig v0.0.0-20180418120404-b67861b076c9/go.mod h1:OdiGKKgT github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= +github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= github.com/getsentry/sentry-go v0.5.1 h1:MIPe7ScHADsrK2vznqmhksIUFxq7m0JfTh+ZIMkI+VQ= github.com/getsentry/sentry-go v0.5.1/go.mod h1:B8H7x8TYDPkeWPRzGpIiFO97LZP6rL8A3hEt8lUItMw= @@ -244,6 +250,10 @@ github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomarkdown/markdown v0.0.0-20200820230800-3724143f5294/go.mod h1:aii0r/K0ZnHv7G0KF7xy1v0A7s2Ljrb5byB7MO5p6TU= +github.com/gomarkdown/markdown v0.0.0-20220306001849-6e467e7bd3e8 h1:GHzpkxehpZ7oJoXHz9WX8Uw0px9FHZ84b1PN+PbkzOs= +github.com/gomarkdown/markdown v0.0.0-20220306001849-6e467e7bd3e8/go.mod h1:JDGcbDT52eL4fju3sZ4TeHGsQwhG9nbDV21aMyhwPoA= +github.com/gomarkdown/mdtohtml v0.0.0-20180202094705-7346712f31b4 h1:Vxxjwxk2/d3kXuyB3DwTHJaNqOGpzOG6pbPrVbwYTCw= +github.com/gomarkdown/mdtohtml v0.0.0-20180202094705-7346712f31b4/go.mod h1:Ea0UDfSa65IZQd6JaB8JvmA74Bl+VxxVC21CphecRwE= github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -310,6 +320,7 @@ github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbk github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= +github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jinzhu/gorm v1.9.12 h1:Drgk1clyWT9t9ERbzHza6Mj/8FY/CqMyVzOiHviMo6Q= github.com/jinzhu/gorm v1.9.12/go.mod h1:vhTjlKSJUTWNtcbQtrMBFCxy7eXTzeCAzfL5fBZT/Qs= @@ -392,6 +403,8 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJK github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180219170247-931426f7535a/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/mattn/goveralls v0.0.11 h1:eJXea6R6IFlL1QMKNMzDvvHv/hwGrnvyig4N+0+XiMM= +github.com/mattn/goveralls v0.0.11/go.mod h1:gU8SyhNswsJKchEV93xRQxX6X3Ei4PJdQk/6ZHvrvRk= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= @@ -419,11 +432,12 @@ github.com/namedotcom/go v0.0.0-20180403034216-08470befbe04/go.mod h1:5sN+Lt1CaY github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nkovacs/streamquote v0.0.0-20170412213628-49af9bddb229/go.mod h1:0aYXnNPJ8l7uZxf45rWW1a/uME32OF0rhiYGNQ2oF2E= +github.com/nkovacs/streamquote v1.0.0 h1:PmVIV08Zlx2lZK5fFZlMZ04eHcDTIFJCv/5/0twVUow= +github.com/nkovacs/streamquote v1.0.0/go.mod h1:BN+NaZ2CmdKqUuTUXUEm9j95B2TRbpOWpxbJYzzgUsc= github.com/nrdcg/auroradns v1.0.1 h1:m/kBq83Xvy3cU261MOknd8BdnOk12q4lAWM+kOdsC2Y= github.com/nrdcg/auroradns v1.0.1/go.mod h1:y4pc0i9QXYlFCWrhWrUSIETnZgrf4KuwjDIWmmXo3JI= github.com/nrdcg/dnspod-go v0.4.0 h1:c/jn1mLZNKF3/osJ6mz3QPxTudvPArXTjpkmYj0uK6U= @@ -549,7 +563,11 @@ github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69 github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1 h1:HGVkRrwDCbmSP6h1CoBDj6l/mhnvsP5JbYaQ4ss0R6o= github.com/t-tiger/gorm-bulk-insert/v2 v2.0.1/go.mod h1:I3xbaE9ud9/TEXzehwkHx86SyJwqeSNsX2X5oV61jIg= github.com/tdewolff/minify/v2 v2.8.0/go.mod h1:6zN8VLhMfFxNrwHROcboYNo2+huPNu4SV8DPh3PUQ8E= +github.com/tdewolff/minify/v2 v2.10.0 h1:ovVAHUcjfGrBDf1EIvsodRUVJiZK/28mMose08B7k14= +github.com/tdewolff/minify/v2 v2.10.0/go.mod h1:6XAjcHM46pFcRE0eztigFPm0Q+Cxsw8YhEWT+rDkcZM= github.com/tdewolff/parse/v2 v2.4.4/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= +github.com/tdewolff/parse/v2 v2.5.27 h1:PL3LzzXaOpmdrknnOlIeO2muIBHAwiKp6TxN1RbU5gI= +github.com/tdewolff/parse/v2 v2.5.27/go.mod h1:WzaJpRSbwq++EIQHYIRTpbYKNA3gn9it1Ik++q4zyho= github.com/tdewolff/test v1.0.6/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7 h1:CpHxIaZzVy26GqJn8ptRyto8fuoYOd1v0fXm9bG3wQ8= github.com/timewasted/linode v0.0.0-20160829202747-37e84520dcf7/go.mod h1:imsgLplxEC/etjIhdr3dNzV3JeT27LbVu5pYWm0JCBY= @@ -565,13 +583,16 @@ github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtX github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.1.1/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1 h1:tY9CJiPnMXf1ERmG2EyK7gNUd+c6RKGD0IfU8WdUSz8= github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= github.com/vultr/govultr v0.1.4/go.mod h1:9H008Uxr/C4vFNGLqKx232C206GL0PBHzOP0809bGNA= github.com/vultr/govultr v0.3.3 h1:fVaF4h9u3VzTXxFsxvgBUCiM52EiahLqAPkizamLzYM= github.com/vultr/govultr v0.3.3/go.mod h1:TUuUizMOFc7z+PNMssb6iGjKjQfpw5arIaOLfocVudQ= +github.com/wellington/go-libsass v0.9.2 h1:6Ims04UDdBs6/CGSVK5JC8FNikR5ssrsMMKE/uaO5Q8= github.com/wellington/go-libsass v0.9.2/go.mod h1:mxgxgam0N0E+NAUMHLcu20Ccfc3mVpDkyrLDayqfiTs= github.com/wellington/sass v0.0.0-20160911051022-cab90b3986d6/go.mod h1:ncYBwTYUjmb7N+sZbf8WJYynLivoqFL+U2f8uOX2Yzk= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -643,7 +664,6 @@ golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -653,8 +673,9 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ= golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20180611182652-db08ff08e862/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -690,6 +711,10 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200904194848-62affa334b73 h1:MXfv8rhZWmFeqX3GNZRsd6vOLoaCHjYEX3qkRo3YBUA= golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -745,12 +770,20 @@ golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200420163511-1957bb5e6d1f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c h1:UIcGWL6/wpCfyGuJnRFJRurA+yj8RrW7Q6x2YMCXt6c= golang.org/x/sys v0.0.0-20200724161237-0e2f3a69832c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -796,8 +829,9 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20201012192620-5bd05386311b h1:Imq6ZJ3mzzAkU1yzH1aHpiF3lTs3ySLzjH8SEfFdW0A= golang.org/x/tools v0.0.0-20201012192620-5bd05386311b/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/notifiers/generate.go b/notifiers/generate.go index cfa4f7f2..babc067d 100644 --- a/notifiers/generate.go +++ b/notifiers/generate.go @@ -1,3 +1,4 @@ +//go:build ignore // +build ignore package main diff --git a/source/statping-ng.wiki b/source/statping-ng.wiki new file mode 160000 index 00000000..a42b2a64 --- /dev/null +++ b/source/statping-ng.wiki @@ -0,0 +1 @@ +Subproject commit a42b2a641164e4c714fc09d6e08fcd6f7d0e5fb4 diff --git a/version.txt b/version.txt index 2b88209d..8f63f4f9 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.90.81 +0.91.0 From 1de547e9bdc881d41eca641b2e32c5340374014e Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 00:26:01 -0700 Subject: [PATCH 09/22] fix docker-compose --- Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 54bcbb90..ef78a2c5 100644 --- a/Makefile +++ b/Makefile @@ -37,16 +37,16 @@ lint: goimports ./... up: - docker compose -f docker compose.yml -f dev/docker compose.full.yml up -d --remove-orphans + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml up -d --remove-orphans make print_details down: - docker compose -f docker compose.yml -f dev/docker compose.full.yml down --volumes --remove-orphans + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml down --volumes --remove-orphans lite: clean docker build -t statping-ng/statping-ng:dev -f dev/Dockerfile.dev . - docker compose -f dev/docker compose.lite.yml down - docker compose -f dev/docker compose.lite.yml up --remove-orphans + docker compose -f dev/docker-compose.lite.yml down + docker compose -f dev/docker-compose.lite.yml up --remove-orphans reup: down clean compose-build-full up @@ -94,37 +94,37 @@ go-run: go run ./cmd start: - docker compose -f docker compose.yml -f dev/docker compose.full.yml start + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml start stop: - docker compose -f docker compose.yml -f dev/docker compose.full.yml stop + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml stop logs: docker logs statping --follow db-up: - docker compose -f dev/docker compose.db.yml up -d --remove-orphans + docker compose -f dev/docker-compose.db.yml up -d --remove-orphans db-down: - docker compose -f dev/docker compose.db.yml down --volumes --remove-orphans + docker compose -f dev/docker-compose.db.yml down --volumes --remove-orphans console: docker exec -t -i statping /bin/sh compose-build-full: - docker compose -f docker compose.yml -f dev/docker compose.full.yml build --parallel --build-arg VERSION=${VERSION} + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml build --parallel --build-arg VERSION=${VERSION} docker-latest: docker build -t statping-ng/statping-ng:latest --build-arg VERSION=${VERSION} . docker-test: - docker compose -f docker compose.test.yml up --remove-orphans + docker compose -f docker-compose.test.yml up --remove-orphans modd: modd -f ./dev/modd.conf top: - docker compose -f docker compose.yml -f dev/docker compose.full.yml top + docker compose -f docker-compose.yml -f dev/docker-compose.full.yml top frontend-build: @echo "Removing old frontend distributions..." From 035db9650bacc0a00759cb87c33349225d74bf03 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 00:45:00 -0700 Subject: [PATCH 10/22] test with updated slack-url --- .github/workflows/1_dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 718a8a89..d0c82c28 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -262,7 +262,7 @@ jobs: MOBILE_NUMBER: ${{ secrets.MOBILE_NUMBER }} PUSHOVER_TOKEN: ${{ secrets.PUSHOVER_TOKEN }} PUSHOVER_API: ${{ secrets.PUSHOVER_API }} - SLACK_URL: ${{ secrets.SLACK_URL }} + SLACK_URL: https://hooks.slack.com/services/TTJ1B90DP/RENU20O9M/9uI823SUnYBuGcxYlpSimD6H TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }} TELEGRAM_CHANNEL: ${{ secrets.TELEGRAM_CHANNEL }} TWILIO_SID: ${{ secrets.TWILIO_SID }} From 6bfdc566e92ed55e3e3766f03748f7cf0cc449c3 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 01:04:46 -0700 Subject: [PATCH 11/22] remove coveralls testing coverage --- .github/workflows/1_dev.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index d0c82c28..07843c60 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -277,12 +277,12 @@ jobs: SNS_REGION: ${{ secrets.SNS_REGION }} SNS_TOPIC: ${{ secrets.SNS_TOPIC }} - - name: Coveralls Testing Coverage - run: | - go get github.com/mattn/goveralls - goveralls -coverprofile=coverage.out -repotoken $COVERALLS - env: - COVERALLS: ${{ secrets.COVERALLS }} +# - name: Coveralls Testing Coverage +# run: | +# go get github.com/mattn/goveralls +# goveralls -coverprofile=coverage.out -repotoken $COVERALLS +# env: +# COVERALLS: ${{ secrets.COVERALLS }} test-postman-sqlite: needs: frontend From 3bd4d03ffbbe827b1bece6a63ac52fe8d7c6264f Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 01:33:47 -0700 Subject: [PATCH 12/22] bump go version --- .github/workflows/1_dev.yml | 12 ++++++------ .github/workflows/2_unstable.yml | 12 ++++++------ .github/workflows/3_stable.yml | 12 ++++++------ .github/workflows/pr.yml | 4 ++-- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 07843c60..ed3978a9 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -112,7 +112,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.15.x + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -207,7 +207,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -291,7 +291,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -345,7 +345,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -402,7 +402,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index cc7c411f..5de01462 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -109,7 +109,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.15.x + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -196,7 +196,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.15.x +# go-version: 1.17.8 # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -280,7 +280,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -334,7 +334,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -391,7 +391,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index b56f13cc..b0f0a051 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -129,7 +129,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.15.x + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -219,7 +219,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.15.x +# go-version: 1.17.8 # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -303,7 +303,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -357,7 +357,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | @@ -414,7 +414,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 30cd68c1..63d59a26 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -135,7 +135,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15.x + go-version: 1.17.8 - name: Setting ENV's run: | From b6824569bd50d090cb6bb9fedc48a004aa28ff1a Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 01:39:30 -0700 Subject: [PATCH 13/22] bump go version --- .github/workflows/1_dev.yml | 12 ++++++------ .github/workflows/2_unstable.yml | 12 ++++++------ .github/workflows/3_stable.yml | 12 ++++++------ .github/workflows/pr.yml | 6 +++--- Makefile | 2 +- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index ed3978a9..81f2e352 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -112,7 +112,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.17.7 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -207,7 +207,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -291,7 +291,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -345,7 +345,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -402,7 +402,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index 5de01462..0a4ab77b 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -109,7 +109,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.17.7 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -196,7 +196,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.17.8 +# go-version: 1.17.7 # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -280,7 +280,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -334,7 +334,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -391,7 +391,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index b0f0a051..12bfcc9a 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -129,7 +129,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.17.7 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} @@ -219,7 +219,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.17.8 +# go-version: 1.17.7 # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -303,7 +303,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -357,7 +357,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | @@ -414,7 +414,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 63d59a26..3c475246 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.8' + go-version: '1.17.7' - uses: actions/setup-node@v1 with: node-version: '16.14.0' @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -135,7 +135,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.8 + go-version: 1.17.7 - name: Setting ENV's run: | diff --git a/Makefile b/Makefile index ef78a2c5..b58427cb 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ COMMIT=$(shell git rev-parse HEAD) SIGN_KEY=B76D61FAA6DB759466E83D9964B9C6AAE2D55278 BINARY_NAME=statping GOBUILD=go build -a -GOVERSION=1.17.8 +GOVERSION=1.17.7 NODE_VERSION=16.14.0 XGO=xgo -go $(GOVERSION) --dest=build BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" From 50a62c813aa65e173c2bc5e787f65606c231d932 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 08:12:48 -0700 Subject: [PATCH 14/22] replace go version --- .github/workflows/1_dev.yml | 10 +++++----- .github/workflows/2_unstable.yml | 10 +++++----- .github/workflows/3_stable.yml | 10 +++++----- .github/workflows/pr.yml | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 81f2e352..329e893b 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -207,7 +207,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -291,7 +291,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -345,7 +345,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -402,7 +402,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index 0a4ab77b..e0deb13c 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -196,7 +196,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.17.7 +# go-version: 1.15.x # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -280,7 +280,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -334,7 +334,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -391,7 +391,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index 12bfcc9a..d0c8961b 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -219,7 +219,7 @@ jobs: # - uses: actions/checkout@v2 # - uses: actions/setup-go@v2 # with: -# go-version: 1.17.7 +# go-version: 1.15.x # - uses: actions/setup-node@v1 # with: # node-version: 16.14.0 @@ -303,7 +303,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -357,7 +357,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | @@ -414,7 +414,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3c475246..b1f7947c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -83,7 +83,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - uses: actions/setup-node@v1 with: node-version: 16.14.0 @@ -135,7 +135,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.17.7 + go-version: 1.15.x - name: Setting ENV's run: | From 6a21f20a836781602e12c7cb398fc4bbe5158b0e Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 08:19:25 -0700 Subject: [PATCH 15/22] bump go versino --- .github/workflows/1_dev.yml | 2 +- .github/workflows/2_unstable.yml | 2 +- .github/workflows/3_stable.yml | 2 +- .github/workflows/pr.yml | 2 +- Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index 329e893b..f77d2cf9 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -112,7 +112,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.7 + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index e0deb13c..0983d9b6 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -109,7 +109,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.7 + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index d0c8961b..9c915f29 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -129,7 +129,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.7 + go_version: 1.17.8 dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b1f7947c..30cd68c1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/setup-go@v2 with: - go-version: '1.17.7' + go-version: '1.17.8' - uses: actions/setup-node@v1 with: node-version: '16.14.0' diff --git a/Makefile b/Makefile index b58427cb..ef78a2c5 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ COMMIT=$(shell git rev-parse HEAD) SIGN_KEY=B76D61FAA6DB759466E83D9964B9C6AAE2D55278 BINARY_NAME=statping GOBUILD=go build -a -GOVERSION=1.17.7 +GOVERSION=1.17.8 NODE_VERSION=16.14.0 XGO=xgo -go $(GOVERSION) --dest=build BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=${COMMIT}" From ff0b84311eeebac040ed121509e67a00206da197 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 08:28:49 -0700 Subject: [PATCH 16/22] update version on workflow --- .github/workflows/1_dev.yml | 2 +- .github/workflows/2_unstable.yml | 2 +- .github/workflows/3_stable.yml | 2 +- .github/workflows/pr.yml | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/1_dev.yml b/.github/workflows/1_dev.yml index f77d2cf9..07843c60 100644 --- a/.github/workflows/1_dev.yml +++ b/.github/workflows/1_dev.yml @@ -112,7 +112,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.15.x dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/2_unstable.yml b/.github/workflows/2_unstable.yml index 0983d9b6..cc7c411f 100644 --- a/.github/workflows/2_unstable.yml +++ b/.github/workflows/2_unstable.yml @@ -109,7 +109,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.15.x dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/3_stable.yml b/.github/workflows/3_stable.yml index 9c915f29..b56f13cc 100644 --- a/.github/workflows/3_stable.yml +++ b/.github/workflows/3_stable.yml @@ -129,7 +129,7 @@ jobs: COMMIT: ${{ github.sha }} with: xgo_version: latest - go_version: 1.17.8 + go_version: 1.15.x dest: build prefix: statping targets: ${{ matrix.platform }}/${{ matrix.arch }} diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 30cd68c1..b7cbdb75 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,7 +41,6 @@ jobs: run: yarn - name: Download Go mods - if: steps.golangcache.outputs.cache-hit != 'true' run: | go mod download go mod verify From b6b5d98af8502cb0d165831a585d9410e910e509 Mon Sep 17 00:00:00 2001 From: Jonathan Barney Date: Wed, 9 Mar 2022 08:32:51 -0700 Subject: [PATCH 17/22] restore cache hit --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b7cbdb75..30cd68c1 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,6 +41,7 @@ jobs: run: yarn - name: Download Go mods + if: steps.golangcache.outputs.cache-hit != 'true' run: | go mod download go mod verify From 5f54a7421f19424bc24bd74ff38eaecb94e25832 Mon Sep 17 00:00:00 2001 From: herb Date: Mon, 21 Mar 2022 13:33:37 +0800 Subject: [PATCH 18/22] fix: log search error --- frontend/src/pages/Logs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Logs.vue b/frontend/src/pages/Logs.vue index 293f84df..e5536823 100644 --- a/frontend/src/pages/Logs.vue +++ b/frontend/src/pages/Logs.vue @@ -61,7 +61,7 @@ export default { const ts = data.match(/[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]:[0-5][0-9]/gm) return { time: ts[0], - message: data.split(ts+": ")[1] + message: data.split(ts+": ")[1] || '' } }, cleanLog(l) { From 96a844a014549821f8285f412d2f1c3d10e60cf0 Mon Sep 17 00:00:00 2001 From: Geoffroy Arnoud Date: Fri, 17 Jun 2022 11:37:00 +0200 Subject: [PATCH 19/22] dev: Add base.gohtml in assets [#137](https://github.com/statping-ng/statping-ng/issues/137) --- frontend/src/API.js | 2 +- handlers/handlers.go | 29 ++++++++++++++++++++++------- source/source.go | 4 +++- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/frontend/src/API.js b/frontend/src/API.js index ffafade6..55e966c8 100644 --- a/frontend/src/API.js +++ b/frontend/src/API.js @@ -8,7 +8,7 @@ const tokenKey = "statping_auth"; class Api { constructor() { this.version = "0.91.0"; - this.commit = "40f31e3110550754a929a9f848c2eefa4df9ae3f"; + this.commit = "b7ecf0c31b0c75c394061d2f6457a925e4440f1e"; } async oauth() { diff --git a/handlers/handlers.go b/handlers/handlers.go index 33346bac..d89d4f30 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -172,18 +172,33 @@ func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data i if err != nil { log.Errorln(err) } - render, err := source.TmplBox.String(file) - if err != nil { - log.Errorln(err) - } - // render the page requested - if _, err := mainTemplate.Parse(render); err != nil { - log.Errorln(err) + + log.Infoln("Ca commence à être intéressant") + asset := file + if source.UsingAssets(utils.Directory) { + + asset = utils.Directory + "/assets/" + file + log.Infoln(fmt.Sprintf("asset : %s", asset)) + + if _, err := mainTemplate.ParseFiles(asset); err != nil { + log.Errorln(err) + } + } else { + render, err := source.TmplBox.String(asset) + if err != nil { + log.Errorln(err) + } + // render the page requested + if _, err := mainTemplate.Parse(render); err != nil { + log.Errorln(err) + } } + log.Infoln("step 3") // execute the template if err := mainTemplate.Execute(w, data); err != nil { log.Errorln(err) } + log.Infoln("step 4") } func returnJson(d interface{}, w http.ResponseWriter, r *http.Request) { diff --git a/source/source.go b/source/source.go index 20488908..81a7f4ac 100644 --- a/source/source.go +++ b/source/source.go @@ -30,6 +30,7 @@ var ( "scss/mobile.scss", "scss/variables.scss", "robots.txt", + "base.gohtml", } ) @@ -87,6 +88,7 @@ func CompileSASS() error { // UsingAssets returns true if the '/assets' folder is found in the directory func UsingAssets(folder string) bool { + log.Infoln(fmt.Sprintf("using assets? checking %s", folder)) if _, err := os.Stat(folder + "/assets"); err == nil { return true } else { @@ -174,7 +176,7 @@ func DeleteAllAssets(folder string) error { // CopyAllToPublic will copy all the files in a rice box into a local folder func CopyAllToPublic(box *rice.Box) error { exclude := map[string]bool{ - "base.gohtml": true, + // "base.gohtml": true, "index.html": true, } From d0555d792f97fe308a3d44c7844ce85a318ca231 Mon Sep 17 00:00:00 2001 From: Geoffroy Arnoud Date: Wed, 22 Jun 2022 14:32:03 +0200 Subject: [PATCH 20/22] Removed useless logging messages [#137](https://github.com/statping-ng/statping-ng/issues/137) --- handlers/handlers.go | 4 ---- source/source.go | 1 - 2 files changed, 5 deletions(-) diff --git a/handlers/handlers.go b/handlers/handlers.go index d89d4f30..fe8a4ae7 100644 --- a/handlers/handlers.go +++ b/handlers/handlers.go @@ -173,12 +173,10 @@ func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data i log.Errorln(err) } - log.Infoln("Ca commence à être intéressant") asset := file if source.UsingAssets(utils.Directory) { asset = utils.Directory + "/assets/" + file - log.Infoln(fmt.Sprintf("asset : %s", asset)) if _, err := mainTemplate.ParseFiles(asset); err != nil { log.Errorln(err) @@ -193,12 +191,10 @@ func ExecuteResponse(w http.ResponseWriter, r *http.Request, file string, data i log.Errorln(err) } } - log.Infoln("step 3") // execute the template if err := mainTemplate.Execute(w, data); err != nil { log.Errorln(err) } - log.Infoln("step 4") } func returnJson(d interface{}, w http.ResponseWriter, r *http.Request) { diff --git a/source/source.go b/source/source.go index 81a7f4ac..544ed1a1 100644 --- a/source/source.go +++ b/source/source.go @@ -88,7 +88,6 @@ func CompileSASS() error { // UsingAssets returns true if the '/assets' folder is found in the directory func UsingAssets(folder string) bool { - log.Infoln(fmt.Sprintf("using assets? checking %s", folder)) if _, err := os.Stat(folder + "/assets"); err == nil { return true } else { From 15e8eb57d6084c1f20ab66f7ccef1421ef2a223a Mon Sep 17 00:00:00 2001 From: Viktor Sidorenko Date: Fri, 24 Jun 2022 17:37:27 +0300 Subject: [PATCH 21/22] fix http_proxy param Hello. In latest build of statping (v0.90.80) not worked http requests via http_proxy. This commit can fix this. --- utils/utils.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index 794638f4..5bd9d564 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -9,7 +9,6 @@ import ( "io/ioutil" "net" "net/http" - "net/url" "os" "os/exec" "strconv" @@ -215,17 +214,9 @@ func HttpRequest(endpoint, method string, contentType interface{}, headers []str Proxy: http.ProxyFromEnvironment, DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { // redirect all connections to host specified in url - addr = strings.Split(req.URL.Host, ":")[0] + addr[strings.LastIndex(addr, ":"):] return dialer.DialContext(ctx, network, addr) }, } - if Params.GetString("HTTP_PROXY") != "" { - proxyUrl, err := url.Parse(Params.GetString("HTTP_PROXY")) - if err != nil { - return nil, nil, err - } - transport.Proxy = http.ProxyURL(proxyUrl) - } if customTLS != nil { transport.TLSClientConfig.RootCAs = customTLS.RootCAs transport.TLSClientConfig.Certificates = customTLS.Certificates From 0bf4ab422bfaacd3349f971331d2d9f89bfb6166 Mon Sep 17 00:00:00 2001 From: Jaroslav Lichtblau Date: Mon, 27 Jun 2022 19:53:44 +0200 Subject: [PATCH 22/22] Typo fixed in czech.js Typo fixed in czech.js --- frontend/src/languages/czech.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/languages/czech.js b/frontend/src/languages/czech.js index c29276d2..0c402349 100644 --- a/frontend/src/languages/czech.js +++ b/frontend/src/languages/czech.js @@ -37,7 +37,7 @@ const czech = { type: "Typ", edit: "Upravit", update: "Aktualizovat", - create: "Vytvořot", + create: "Vytvořit", view: "Zobrazit", save: "Uložit", title: "Název",