Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 0 additions & 21 deletions docker/docker-compose.alerting.yml

This file was deleted.

25 changes: 24 additions & 1 deletion docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,31 @@ services:
# service_started, not service_healthy as pinot and deps can take longer than 60s to start
condition: service_started

hypertrace-alert-engine:
image: hypertrace/hypertrace-alert-engine:1.0.7
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once, we have fixed for latest version, we will remove the version tag.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed! Could you check once and update here.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

container_name: hypertrace-alert-engine
# comment below two lines if you want to run alert-engine after modifying appropriate
# alert-rules.json and notification-rules.json files
entrypoint: [ "/bin/sh" ]
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you explain this part?

command: ["-c",
"echo Pl. comment out entrypoint and command to run alert engine
after configuring alert-rules.json and notification-rules.json"]
environment:
- ALERT_RULES_PATH=/app/resources/alert-rules.json
- NOTIFICATION_CHANNELS_PATH=/app/resources/notification-rules.json
- QUERY_SERVICE_HOST_CONFIG=hypertrace
- QUERY_SERVICE_PORT_CONFIG=9001
- ATTRIBUTE_SERVICE_HOST_CONFIG=hypertrace
- ATTRIBUTE_SERVICE_PORT_CONFIG=9001
volumes:
- ../docker/configs/alert-rules.json:/app/resources/alert-rules.json:ro
- ../docker/configs/notification-rules.json:/app/resources/notification-rules.json:ro
depends_on:
hypertrace:
# service_started, not service_healthy as pinot and deps can take longer than 60s to start
condition: service_healthy

# Third-party data services:
# Third-party data services:

# Kafka is used for streaming functionality.
# ZooKeeper is required by Kafka and Pinot
Expand Down
23 changes: 23 additions & 0 deletions docker/postgres/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,29 @@ services:
# service_started, not service_healthy as pinot and deps can take longer than 60s to start
condition: service_started

hypertrace-alert-engine:
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kotharironak , I see what you have done here. Ideally the way we had 2 different files earlier makes more sense considering I don't want alerting when I am trying it out for first time anyways because I am just trying out platform.

If directory or command is the problem, we can have duplicate files but let's have it in 2 steps. First step will be quick-start with Hypertrace and then try out alerting with Hypertrace. It will be cleaner way because you will need to stop and start the whole stack again in your case anyways but then there's additional thing to do that is comment these lines etc.

cc: @rish691

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JBAhire In that case, we need a copy of the same files in postgres folder. I can do that as well. I will copy alerting files in postgres folder then.

Copy link
Copy Markdown
Contributor Author

@kotharironak kotharironak Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed offline with @JBAhire, let's keep the default + postgres folder in sync. And, we will go with one simple command.
docker-compose -f <default file> -f <alerting file>

image: hypertrace/hypertrace-alert-engine:1.0.7
container_name: hypertrace-alert-engine
# comment below two lines if you want to run alert-engine after modifying appropriate
# alert-rules.json and notification-rules.json files
entrypoint: [ "/bin/sh" ]
command: [ "-c",
"echo Pl. comment out entrypoint and command to run alert engine
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case we agree to go with this one, don't use abbreviations here.

after configuring alert-rules.json and notification-rules.json" ]
environment:
- ALERT_RULES_PATH=/app/resources/alert-rules.json
- NOTIFICATION_CHANNELS_PATH=/app/resources/notification-rules.json
- QUERY_SERVICE_HOST_CONFIG=hypertrace
- QUERY_SERVICE_PORT_CONFIG=9001
- ATTRIBUTE_SERVICE_HOST_CONFIG=hypertrace
- ATTRIBUTE_SERVICE_PORT_CONFIG=9001
volumes:
- ../../docker/configs/alert-rules.json:/app/resources/alert-rules.json:ro
- ../../docker/configs/notification-rules.json:/app/resources/notification-rules.json:ro
depends_on:
hypertrace:
# service_started, not service_healthy as pinot and deps can take longer than 60s to start
condition: service_healthy
# Third-party data services:

# Kafka is used for streaming functionality.
Expand Down