diff --git a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java index ecd6f7c..3dc4148 100644 --- a/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java +++ b/SymphonyManager/src/main/java/io/github/lumijiez/BrokerConnector.java @@ -37,7 +37,7 @@ public class BrokerConnector { Channel channel = connection.createChannel()) { channel.queueDeclare(QUEUE_NAME, false, false, false, null); - System.out.println("Waiting for messages. To exit press CTRL+C"); + System.out.println("Connected to RabbitMQ and queue declared."); DeliverCallback deliverCallback = (consumerTag, delivery) -> { // String message = new String(delivery.getBody(), StandardCharsets.UTF_8); diff --git a/config/grafana/provisioning/alerting/alert_rules.yaml b/config/grafana/provisioning/alerting/alert_rules.yaml new file mode 100644 index 0000000..ec482ab --- /dev/null +++ b/config/grafana/provisioning/alerting/alert_rules.yaml @@ -0,0 +1 @@ +groups: [] \ No newline at end of file diff --git a/config/grafana/provisioning/alerting/contact_points.yaml b/config/grafana/provisioning/alerting/contact_points.yaml new file mode 100644 index 0000000..4961887 --- /dev/null +++ b/config/grafana/provisioning/alerting/contact_points.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 +contactPoints: + - orgId: 1 + name: default-receiver + receivers: + - uid: default-receiver + type: email + settings: + addresses: "" \ No newline at end of file diff --git a/config/grafana/provisioning/alerting/notification_policies.yaml b/config/grafana/provisioning/alerting/notification_policies.yaml new file mode 100644 index 0000000..b1c08bb --- /dev/null +++ b/config/grafana/provisioning/alerting/notification_policies.yaml @@ -0,0 +1,9 @@ +apiVersion: 1 +policies: + - orgId: 1 + receiver: "default-receiver" + group_by: ['alertname'] + routes: + - receiver: "default-receiver" + group_by: ['alertname'] + repeat_interval: "1h" \ No newline at end of file diff --git a/config/grafana/provisioning/plugins/plugins.yaml b/config/grafana/provisioning/plugins/plugins.yaml new file mode 100644 index 0000000..db587cd --- /dev/null +++ b/config/grafana/provisioning/plugins/plugins.yaml @@ -0,0 +1,4 @@ +apiVersion: 1 +plugins: + - name: xychart + enabled: true diff --git a/config/rabbitmq/rabbit.conf b/config/rabbitmq/rabbit.conf index 099a149..1c19fef 100644 --- a/config/rabbitmq/rabbit.conf +++ b/config/rabbitmq/rabbit.conf @@ -1,2 +1,3 @@ log.console = false log.console.level = error +log.console.use_colors = on diff --git a/docker-compose.yml b/docker-compose.yml index 9086b6d..69e6826 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -22,6 +22,10 @@ services: rabbitmq: image: "rabbitmq:management" container_name: rabbitmq + command: > + sh -c " + rabbitmq-plugins enable --offline rabbitmq_prometheus && + rabbitmq-server" ports: - "5672:5672" - "15672:15672" @@ -31,10 +35,6 @@ services: - RABBITMQ_DEFAULT_PASS=symphony - RABBITMQ_NODENAME=rabbit@rabbitmq - RABBITMQ_PROMETHEUS_RETENTION_POLICY=1h - command: > - sh -c " - rabbitmq-plugins enable --offline rabbitmq_prometheus && - rabbitmq-server" volumes: - ./config/rabbitmq/rabbit.conf:/etc/rabbitmq/rabbitmq.conf:ro networks: @@ -44,6 +44,9 @@ services: prometheus: image: prom/prometheus container_name: prometheus + command: + - "--log.level=warn" + - "--config.file=/etc/prometheus/prometheus.yml" ports: - "9090:9090" volumes: @@ -54,31 +57,45 @@ services: grafana: image: grafana/grafana container_name: grafana + user: "472:472" ports: - "3000:3000" - volumes: - - ./config/grafana/provisioning:/etc/grafana/provisioning - - ./config/grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards environment: - GF_SECURITY_ADMIN_USER=symphony - GF_SECURITY_ADMIN_PASSWORD=symphony + - GF_LOG_LEVEL=warn + - GF_DATABASE_TYPE=sqlite3 + - GF_DATABASE_PATH=/var/lib/grafana/grafana.db + volumes: + - ./config/grafana/provisioning:/etc/grafana/provisioning + - ./config/grafana/provisioning/dashboards:/etc/grafana/provisioning/dashboards + - ./config/grafana/provisioning/datasources:/etc/grafana/provisioning/datasources + - ./config/grafana/provisioning/plugins:/etc/grafana/provisioning/plugins + - ./config/grafana/provisioning/alerting:/etc/grafana/provisioning/alerting + - ./config/grafana/plugins-bundled:/usr/share/grafana/plugins-bundled + - grafana-storage:/var/lib/grafana networks: - symphony-network node-exporter: image: prom/node-exporter:latest container_name: node-exporter - ports: - - "9100:9100" command: - "--no-collector.hwmon" + - "--log.level=warn" + ports: + - "9100:9100" volumes: - /proc:/host/proc:ro - /sys:/host/sys:ro - /:/rootfs:ro - restart: always + - /run/udev:/run/udev:ro networks: - symphony-network + restart: always + +volumes: + grafana-storage: networks: symphony-network: