mirror of
https://github.com/absmach/supermq.git
synced 2026-06-23 06:40:19 +00:00
b3e2f41194
* WIP: alarms service * fix(alarms): remove rule entity since it is not stored here Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * test(alarms): add tests cases for invalid alarms * feat(alarms): add authorization * feat(alarms): add docker deployment files Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix: update go mod file * feat(alarms): support filtering by resolved_by, updated_by and severity Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * style: fix linter errors Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): provide correct otel naming for create alarm Fixes https://github.com/absmach/magistrala/pull/106#discussion_r2030151971 Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): group routes appropriately Resolves https://github.com/absmach/magistrala/pull/106#discussion_r2030160891 Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): extract alarm id from url path rather than query params Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): add all status to help in decoding Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * style(alarms): maintain consistent import as naming for supermq api package Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * refactor(alarms): update supermq dependecy to the latest Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): Add domains gRPC service config to alarms service Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * test(alarms): all CRUD operations from the service Return empty results instead of nil This standardizes error responses across alarm endpoints to return empty result structs rather than nil. Also renames entityReq to alarmReq and adds HTTP status codes for created/deleted alarms. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * test(alarms): fix failing tests due to introduction of context on sdk Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): remove channel id Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): standardize error handling across CRUD operations Updated error responses to use specific repository errors for consistency Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): add assignment fields to Alarm model and database Introduced AssignedAt and AssignedBy fields to the Alarm struct and updated the database schema accordingly. Enhanced the UpdateAlarm function to handle these new fields, ensuring proper assignment tracking in the alarms system. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): enhance Alarm model with measurement attributes Updated the Alarm struct to include Measurement, Value, Unit, and Cause fields. Modified the validation logic to ensure these fields are present. Adjusted logging and tracing middleware to reflect the new attributes. Updated database schema and related functions to accommodate these changes, ensuring comprehensive alarm data management. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): consume events from pubsub for creation of alarms Removed session dependencies from CreateAlarm method and enhanced alarm validation to ensure all required fields are present Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * style(alarms): add newline at the end of docker compose Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): Add assignee id and metadata fields when consuming messages Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): add acknowledged field Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): Add threshold value for the specific measurement Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): Add channel, thing, and subtopic fields to Alarm model This change adds required fields for tracking alarm sources and reorganizes alarm-related fields for better grouping. Alarms now track the channel, thing, and subtopic that triggered them, along with domain and rule info. Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * test(alarms): add service layer tests Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): consume created at from message rather than creating it Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): ready alarm as a gob encoded object Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): read alarms from alarms queue and remove transformer g Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): update version of supermq Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * feat(alarms): add gob transformer Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): rename thing id to client id Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): create alarms stream Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): check on logic to create new alarm create new alarm if severity, status, subtopic changes enhance logging with additional details for alarms management Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * remove conusmer and use pubsub Signed-off-by: Rodney Osodo <socials@rodneyosodo.com> * fix(alarms): use build tags for rabbitmq and nats * fix(alarms): add health and metrics endpoint * fix(magistrala): use supermq as build flags to see version and commit * fix(alarms): use js config * fix(alarms): remove validation when updating an alarm fix authorization too --------- Signed-off-by: Rodney Osodo <socials@rodneyosodo.com>
266 lines
8.5 KiB
Makefile
266 lines
8.5 KiB
Makefile
# Copyright (c) Abstract Machines
|
|
# SPDX-License-Identifier: Apache-2.0
|
|
|
|
MG_DOCKER_IMAGE_NAME_PREFIX ?= ghcr.io/absmach/magistrala
|
|
BUILD_DIR = build
|
|
SERVICES = bootstrap provision re postgres-writer postgres-reader timescale-writer timescale-reader cli alarms
|
|
DOCKERS = $(addprefix docker_,$(SERVICES))
|
|
DOCKERS_DEV = $(addprefix docker_dev_,$(SERVICES))
|
|
CGO_ENABLED ?= 0
|
|
GOARCH ?= amd64
|
|
VERSION ?= $(shell git describe --abbrev=0 --tags 2>/dev/null || echo 'unknown')
|
|
COMMIT ?= $(shell git rev-parse HEAD)
|
|
TIME ?= $(shell date +%F_%T)
|
|
USER_REPO ?= $(shell git remote get-url origin | sed -E 's@.*/([^/]+)/([^/.]+)(\.git)?@\1_\2@')
|
|
empty:=
|
|
space:= $(empty) $(empty)
|
|
# Docker compose project name should follow this guidelines: https://docs.docker.com/compose/reference/#use--p-to-specify-a-project-name
|
|
DOCKER_PROJECT ?= $(shell echo $(subst $(space),,$(USER_REPO)) | sed -E 's/[^a-zA-Z0-9]/_/g' | tr '[:upper:]' '[:lower:]')
|
|
DOCKER_COMPOSE_COMMANDS_SUPPORTED := up down config
|
|
DEFAULT_DOCKER_COMPOSE_COMMAND := up
|
|
GRPC_MTLS_CERT_FILES_EXISTS = 0
|
|
MOCKERY_VERSION=v3.0.0-beta.6
|
|
PKG_PROTO_GEN_OUT_DIR=api/grpc
|
|
INTERNAL_PROTO_DIR=internal/proto
|
|
INTERNAL_PROTO_FILES := $(shell find $(INTERNAL_PROTO_DIR) -name "*.proto" | sed 's|$(INTERNAL_PROTO_DIR)/||')
|
|
|
|
ifneq ($(MG_MESSAGE_BROKER_TYPE),)
|
|
MG_MESSAGE_BROKER_TYPE := $(MG_MESSAGE_BROKER_TYPE)
|
|
else
|
|
MG_MESSAGE_BROKER_TYPE=msg_nats
|
|
endif
|
|
|
|
ifneq ($(MG_ES_TYPE),)
|
|
MG_ES_TYPE := $(MG_ES_TYPE)
|
|
else
|
|
MG_ES_TYPE=es_nats
|
|
endif
|
|
|
|
define compile_service
|
|
CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) GOARM=$(GOARM) \
|
|
go build -tags $(MG_MESSAGE_BROKER_TYPE) -tags $(MG_ES_TYPE) -ldflags "-s -w \
|
|
-X 'github.com/absmach/supermq.BuildTime=$(TIME)' \
|
|
-X 'github.com/absmach/supermq.Version=$(VERSION)' \
|
|
-X 'github.com/absmach/supermq.Commit=$(COMMIT)'" \
|
|
-o ${BUILD_DIR}/$(1) cmd/$(1)/main.go
|
|
endef
|
|
|
|
define make_docker
|
|
$(eval svc=$(subst docker_,,$(1)))
|
|
|
|
docker build \
|
|
--no-cache \
|
|
--build-arg SVC=$(svc) \
|
|
--build-arg GOARCH=$(GOARCH) \
|
|
--build-arg GOARM=$(GOARM) \
|
|
--build-arg VERSION=$(VERSION) \
|
|
--build-arg COMMIT=$(COMMIT) \
|
|
--build-arg TIME=$(TIME) \
|
|
--tag=$(MG_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
|
|
-f docker/Dockerfile .
|
|
endef
|
|
|
|
define make_docker_dev
|
|
$(eval svc=$(subst docker_dev_,,$(1)))
|
|
|
|
docker build \
|
|
--no-cache \
|
|
--build-arg SVC=$(svc) \
|
|
--tag=$(MG_DOCKER_IMAGE_NAME_PREFIX)/$(svc) \
|
|
-f docker/Dockerfile.dev ./build
|
|
endef
|
|
|
|
ADDON_SERVICES = bootstrap provision certs timescale-reader timescale-writer postgres-reader postgres-writer
|
|
|
|
EXTERNAL_SERVICES = vault prometheus
|
|
|
|
ifneq ($(filter run%,$(firstword $(MAKECMDGOALS))),)
|
|
temp_args := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
|
DOCKER_COMPOSE_COMMAND := $(if $(filter $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(filter $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(DEFAULT_DOCKER_COMPOSE_COMMAND))
|
|
$(eval $(DOCKER_COMPOSE_COMMAND):;@)
|
|
endif
|
|
|
|
ifneq ($(filter run_addons%,$(firstword $(MAKECMDGOALS))),)
|
|
temp_args := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
|
|
RUN_ADDON_ARGS := $(if $(filter-out $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)), $(filter-out $(DOCKER_COMPOSE_COMMANDS_SUPPORTED),$(temp_args)),$(ADDON_SERVICES) $(EXTERNAL_SERVICES))
|
|
$(eval $(RUN_ADDON_ARGS):;@)
|
|
endif
|
|
|
|
ifneq ("$(wildcard docker/ssl/certs/*-grpc-*)","")
|
|
GRPC_MTLS_CERT_FILES_EXISTS = 1
|
|
else
|
|
GRPC_MTLS_CERT_FILES_EXISTS = 0
|
|
endif
|
|
|
|
FILTERED_SERVICES = $(filter-out $(RUN_ADDON_ARGS), $(SERVICES))
|
|
|
|
all: $(SERVICES)
|
|
|
|
.PHONY: all $(SERVICES) dockers dockers_dev latest release run run_addons grpc_mtls_certs check_mtls check_certs test_api mocks
|
|
|
|
clean:
|
|
rm -rf ${BUILD_DIR}
|
|
|
|
cleandocker:
|
|
# Stops containers and removes containers, networks, volumes, and images created by up
|
|
docker compose -f docker/docker-compose.yaml -p $(DOCKER_PROJECT) down --rmi all -v --remove-orphans
|
|
|
|
ifdef pv
|
|
# Remove unused volumes
|
|
docker volume ls -f name=$(MG_DOCKER_IMAGE_NAME_PREFIX) -f dangling=true -q | xargs -r docker volume rm
|
|
endif
|
|
|
|
install:
|
|
for file in $(BUILD_DIR)/*; do \
|
|
cp $$file $(GOBIN)/magistrala-`basename $$file`; \
|
|
done
|
|
|
|
mocks:
|
|
@which mockery > /dev/null || go install github.com/vektra/mockery/v3@$(MOCKERY_VERSION)
|
|
mockery --config ./tools/config/.mockery.yaml
|
|
|
|
|
|
DIRS = consumers readers postgres internal
|
|
test: mocks
|
|
mkdir -p coverage
|
|
@for dir in $(DIRS); do \
|
|
go test -v --race -count 1 -tags test -coverprofile=coverage/$$dir.out $$(go list ./... | grep $$dir | grep -v 'cmd'); \
|
|
done
|
|
go test -v --race -count 1 -tags test -coverprofile=coverage/coverage.out $$(go list ./... | grep -v 'consumers\|readers\|postgres\|internal\|cmd')
|
|
|
|
define test_api_service
|
|
$(eval svc=$(subst test_api_,,$(1)))
|
|
@which st > /dev/null || (echo "schemathesis not found, please install it from https://github.com/schemathesis/schemathesis#getting-started" && exit 1)
|
|
|
|
@if [ -z "$(USER_TOKEN)" ]; then \
|
|
echo "USER_TOKEN is not set"; \
|
|
echo "Please set it to a valid token"; \
|
|
exit 1; \
|
|
fi
|
|
|
|
@if [ "$(svc)" = "http" ] && [ -z "$(THING_SECRET)" ]; then \
|
|
echo "THING_SECRET is not set"; \
|
|
echo "Please set it to a valid secret"; \
|
|
exit 1; \
|
|
fi
|
|
|
|
@if [ "$(svc)" = "http" ]; then \
|
|
st run api/openapi/$(svc).yaml \
|
|
--checks all \
|
|
--base-url $(2) \
|
|
--header "Authorization: Thing $(THING_SECRET)" \
|
|
--contrib-openapi-formats-uuid \
|
|
--hypothesis-suppress-health-check=filter_too_much \
|
|
--stateful=links; \
|
|
else \
|
|
st run api/openapi/$(svc).yaml \
|
|
--checks all \
|
|
--base-url $(2) \
|
|
--header "Authorization: Bearer $(USER_TOKEN)" \
|
|
--contrib-openapi-formats-uuid \
|
|
--hypothesis-suppress-health-check=filter_too_much \
|
|
--stateful=links; \
|
|
fi
|
|
endef
|
|
|
|
test_api_users: TEST_API_URL := http://localhost:9002
|
|
test_api_things: TEST_API_URL := http://localhost:9000
|
|
test_api_http: TEST_API_URL := http://localhost:8008
|
|
test_api_invitations: TEST_API_URL := http://localhost:9020
|
|
test_api_auth: TEST_API_URL := http://localhost:8189
|
|
test_api_bootstrap: TEST_API_URL := http://localhost:9013
|
|
test_api_certs: TEST_API_URL := http://localhost:9019
|
|
test_api_provision: TEST_API_URL := http://localhost:9016
|
|
test_api_readers: TEST_API_URL := http://localhost:9009 # This can be the URL of any reader service.
|
|
test_api_journal: TEST_API_URL := http://localhost:9021
|
|
|
|
$(TEST_API):
|
|
$(call test_api_service,$(@),$(TEST_API_URL))
|
|
|
|
proto:
|
|
mkdir -p $(PKG_PROTO_GEN_OUT_DIR)
|
|
protoc -I $(INTERNAL_PROTO_DIR) --go_out=$(PKG_PROTO_GEN_OUT_DIR) --go_opt=paths=source_relative --go-grpc_out=$(PKG_PROTO_GEN_OUT_DIR) --go-grpc_opt=paths=source_relative $(INTERNAL_PROTO_FILES)
|
|
|
|
$(FILTERED_SERVICES):
|
|
$(call compile_service,$(@))
|
|
|
|
$(DOCKERS):
|
|
$(call make_docker,$(@),$(GOARCH))
|
|
|
|
$(DOCKERS_DEV):
|
|
$(call make_docker_dev,$(@))
|
|
|
|
dockers: $(DOCKERS)
|
|
dockers_dev: $(DOCKERS_DEV)
|
|
|
|
define docker_push
|
|
for svc in $(SERVICES); do \
|
|
docker push $(MG_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(1); \
|
|
done
|
|
endef
|
|
|
|
changelog:
|
|
git log $(shell git describe --tags --abbrev=0)..HEAD --pretty=format:"- %s"
|
|
|
|
latest: dockers
|
|
$(call docker_push,latest)
|
|
|
|
release:
|
|
$(eval version = $(shell git describe --abbrev=0 --tags))
|
|
git checkout $(version)
|
|
$(MAKE) dockers
|
|
for svc in $(SERVICES); do \
|
|
docker tag $(MG_DOCKER_IMAGE_NAME_PREFIX)/$$svc $(MG_DOCKER_IMAGE_NAME_PREFIX)/$$svc:$(version); \
|
|
done
|
|
$(call docker_push,$(version))
|
|
|
|
rundev:
|
|
cd scripts && ./run.sh
|
|
|
|
grpc_mtls_certs:
|
|
$(MAKE) -C docker/ssl auth_grpc_certs things_grpc_certs
|
|
|
|
check_tls:
|
|
ifeq ($(GRPC_TLS),true)
|
|
@unset GRPC_MTLS
|
|
@echo "gRPC TLS is enabled"
|
|
GRPC_MTLS=
|
|
else
|
|
@unset GRPC_TLS
|
|
GRPC_TLS=
|
|
endif
|
|
|
|
check_mtls:
|
|
ifeq ($(GRPC_MTLS),true)
|
|
@unset GRPC_TLS
|
|
@echo "gRPC MTLS is enabled"
|
|
GRPC_TLS=
|
|
else
|
|
@unset GRPC_MTLS
|
|
GRPC_MTLS=
|
|
endif
|
|
|
|
check_certs: check_mtls check_tls
|
|
ifeq ($(GRPC_MTLS_CERT_FILES_EXISTS),0)
|
|
ifeq ($(filter true,$(GRPC_MTLS) $(GRPC_TLS)),true)
|
|
ifeq ($(filter $(DEFAULT_DOCKER_COMPOSE_COMMAND),$(DOCKER_COMPOSE_COMMAND)),$(DEFAULT_DOCKER_COMPOSE_COMMAND))
|
|
$(MAKE) -C docker/ssl auth_grpc_certs things_grpc_certs
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
fetch_supermq:
|
|
@./scripts/supermq.sh
|
|
|
|
run:
|
|
docker compose -f docker/docker-compose.yaml \
|
|
-f docker/addons/timescale-reader/docker-compose.yaml \
|
|
-f docker/addons/timescale-writer/docker-compose.yaml \
|
|
--env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)
|
|
|
|
run_addons: check_certs
|
|
$(foreach SVC,$(RUN_ADDON_ARGS),$(if $(filter $(SVC),$(ADDON_SERVICES) $(EXTERNAL_SERVICES)),,$(error Invalid Service $(SVC))))
|
|
@for SVC in $(RUN_ADDON_ARGS); do \
|
|
MG_ADDONS_CERTS_PATH_PREFIX="../." docker compose -f docker/addons/$$SVC/docker-compose.yaml -p $(DOCKER_PROJECT) --env-file ./docker/.env $(DOCKER_COMPOSE_COMMAND) $(args) & \
|
|
done
|