From 1c43655336587f9748f92a0aa4adeba4d51b2beb Mon Sep 17 00:00:00 2001 From: Vikrant Gupta Date: Tue, 8 Apr 2025 18:51:59 +0530 Subject: [PATCH] fix(ff): alert creation disabled for non metric alerts (#7561) --- ee/query-service/Dockerfile | 21 +++++++++++++++++++ .../src/container/FormAlertRules/index.tsx | 5 ----- pkg/query-service/Dockerfile | 21 +++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 ee/query-service/Dockerfile create mode 100644 pkg/query-service/Dockerfile diff --git a/ee/query-service/Dockerfile b/ee/query-service/Dockerfile new file mode 100644 index 0000000000..1cd477222e --- /dev/null +++ b/ee/query-service/Dockerfile @@ -0,0 +1,21 @@ +FROM alpine:3.20.3 +LABEL maintainer="signoz" +WORKDIR /root + +ARG OS="linux" +ARG TARGETARCH + +RUN apk update && \ + apk add ca-certificates && \ + rm -rf /var/cache/apk/* + + +COPY ./target/${OS}-${TARGETARCH}/signoz /root/signoz +COPY ./conf/prometheus.yml /root/config/prometheus.yml +COPY ./templates/email /root/templates +COPY frontend/build/ /etc/signoz/web/ + +RUN chmod 755 /root /root/signoz + +ENTRYPOINT ["./signoz"] +CMD ["-config", "/root/config/prometheus.yml"] \ No newline at end of file diff --git a/frontend/src/container/FormAlertRules/index.tsx b/frontend/src/container/FormAlertRules/index.tsx index df4761d2de..3d3d1950f2 100644 --- a/frontend/src/container/FormAlertRules/index.tsx +++ b/frontend/src/container/FormAlertRules/index.tsx @@ -684,10 +684,6 @@ function FormAlertRules({ const isAlertNameMissing = !formInstance.getFieldValue('alert'); - const isAlertAvailableToSave = - currentQuery.queryType === EQueryType.QUERY_BUILDER && - alertType !== AlertTypes.METRICS_BASED_ALERT; - const onUnitChangeHandler = (value: string): void => { setYAxisUnit(value); // reset target unit @@ -860,7 +856,6 @@ function FormAlertRules({ icon={} disabled={ isAlertNameMissing || - isAlertAvailableToSave || !isChannelConfigurationValid || queryStatus === 'error' } diff --git a/pkg/query-service/Dockerfile b/pkg/query-service/Dockerfile new file mode 100644 index 0000000000..043bfb0cd0 --- /dev/null +++ b/pkg/query-service/Dockerfile @@ -0,0 +1,21 @@ +FROM alpine:3.20.3 +LABEL maintainer="signoz" +WORKDIR /root + +ARG OS="linux" +ARG TARGETARCH + +RUN apk update && \ + apk add ca-certificates && \ + rm -rf /var/cache/apk/* + + +COPY ./target/${OS}-${TARGETARCH}/signoz-community /root/signoz +COPY ./conf/prometheus.yml /root/config/prometheus.yml +COPY ./templates/email /root/templates +COPY frontend/build/ /etc/signoz/web/ + +RUN chmod 755 /root /root/signoz + +ENTRYPOINT ["./signoz"] +CMD ["-config", "/root/config/prometheus.yml"]