Skip to content
Merged

Dev #79

Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Rebuilds and restarts only the engine service to apply code changes.
```

**Services:**
- **Abada Engine**: [http://localhost:5601/abada/api](http://localhost:5601/abada/api)
- **Abada Engine**: [http://localhost:5601/api](http://localhost:5601/api)
- **Abada Tenda** (Task UI): [http://localhost:5602](http://localhost:5602)
- **Abada Orun** (Monitoring UI): [http://localhost:5603](http://localhost:5603)
- **Grafana**: [http://localhost:3000](http://localhost:3000) (admin/admin123)
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ services:
- abada-network
restart: unless-stopped
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/abada/api/actuator/health" ]
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/api/actuator/health" ]
interval: 30s
timeout: 10s
retries: 3
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ services:
- abada-network
restart: always
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/abada/api/actuator/health" ]
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/api/actuator/health" ]
interval: 30s
timeout: 10s
retries: 3
Expand All @@ -65,9 +65,9 @@ services:
condition: service_started
labels:
- "traefik.enable=true"
- "traefik.http.routers.abada.rule=PathPrefix(`/abada`)"
- "traefik.http.routers.abada.rule=PathPrefix(`/api`)"
- "traefik.http.services.abada.loadbalancer.server.port=5601"
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/abada/api/actuator/health"
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/api/actuator/health"
- "traefik.http.services.abada.loadbalancer.healthcheck.interval=30s"

volumes:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ services:
- abada-network
restart: "no" # No restart for tests
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/abada/api/actuator/health" ]
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/api/actuator/health" ]
interval: 10s
timeout: 5s
retries: 3
Expand Down
2 changes: 1 addition & 1 deletion docker/prometheus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ scrape_configs:
- job_name: 'abada-engine'
static_configs:
- targets: ['abada-engine:5601']
metrics_path: /abada/api/actuator/prometheus
metrics_path: /api/actuator/prometheus
scrape_interval: 15s
scrape_timeout: 10s

Expand Down
34 changes: 17 additions & 17 deletions docs/architecture/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,17 +231,17 @@ DELETE /v1/processes/instances/{instanceId}
#### Task Management

```
GET /abada/api/tasks
POST /abada/api/tasks/{id}/claim
POST /abada/api/tasks/{id}/complete
POST /abada/api/tasks/{id}/fail
GET /api/tasks
POST /api/tasks/{id}/claim
POST /api/tasks/{id}/complete
POST /api/tasks/{id}/fail
```

#### Event Management

```
POST /abada/api/events/messages
POST /abada/api/events/signals
POST /api/events/messages
POST /api/events/signals
```

## Deployment Architecture
Expand Down Expand Up @@ -337,8 +337,8 @@ services:

**Access URLs:**

- Engine: <http://localhost:5601/abada/api>
- H2 Console: <http://localhost:5601/abada/api/h2-console>
- Engine: <http://localhost:5601/api>
- H2 Console: <http://localhost:5601/api/h2-console>
- Grafana: <http://localhost:3000>
- Jaeger: <http://localhost:16686>

Expand Down Expand Up @@ -530,7 +530,7 @@ scrape_configs:
- job_name: 'abada-engine'
static_configs:
- targets: ['abada-engine:5601']
metrics_path: /abada/api/actuator/prometheus
metrics_path: /api/actuator/prometheus
scrape_interval: 15s
```

Expand Down Expand Up @@ -651,7 +651,7 @@ CREATE TABLE task_instance (

```yaml
labels:
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/abada/api/actuator/health"
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/api/actuator/health"
- "traefik.http.services.abada.loadbalancer.healthcheck.interval=30s"
```

Expand Down Expand Up @@ -907,7 +907,7 @@ groups:
docker stats abada-engine

# Check JVM heap usage
curl http://localhost:5601/abada/api/actuator/metrics/jvm.memory.used
curl http://localhost:5601/api/actuator/metrics/jvm.memory.used
```

**Solutions:**
Expand All @@ -931,7 +931,7 @@ curl http://localhost:5601/abada/api/actuator/metrics/jvm.memory.used
docker compose exec postgres pg_isready -U abada

# Check connection pool metrics
curl http://localhost:5601/abada/api/actuator/metrics/hikaricp.connections.active
curl http://localhost:5601/api/actuator/metrics/hikaricp.connections.active
```

**Solutions:**
Expand Down Expand Up @@ -985,10 +985,10 @@ docker compose exec postgres psql -U abada -d abada_engine

```bash
# Check service health
curl http://localhost:5601/abada/api/actuator/health
curl http://localhost:5601/api/actuator/health

# Check metrics
curl http://localhost:5601/abada/api/actuator/prometheus
curl http://localhost:5601/api/actuator/prometheus

# Check traces
curl http://localhost:16686/api/services
Expand Down Expand Up @@ -1033,7 +1033,7 @@ docker compose -f docker-compose.yml -f docker-compose.dev.yml up -d

4. **Access Services:**

- Engine: <http://localhost:5601/abada/api>
- Engine: <http://localhost:5601/api>
- Grafana: <http://localhost:3000>
- Jaeger: <http://localhost:16686>

Expand Down Expand Up @@ -1144,7 +1144,7 @@ docker compose -f docker-compose.yml -f docker-compose.prod.yml ps

```bash
# Check all services are healthy
curl http://localhost/abada/api/actuator/health
curl http://localhost/api/actuator/health
curl http://localhost:3000/api/health
curl http://localhost:16686/api/services
```
Expand Down Expand Up @@ -1226,6 +1226,6 @@ This architecture and deployment guide provides comprehensive information for de
For additional support or questions, refer to:

- Project documentation in `/docs`
- API documentation at `/abada/api/docs`
- API documentation at `/api/docs`
- Monitoring dashboards in Grafana
- Issue tracking in the project repository
6 changes: 3 additions & 3 deletions docs/archive/docker-deployment-plan.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ File: `docker/prometheus.yml`

Scrape targets:
- OTEL Collector metrics: `otel-collector:8889`
- Abada Engine actuator: `abada-engine:5601/abada/api/actuator/prometheus`
- Abada Engine actuator: `abada-engine:5601/api/actuator/prometheus`
- Prometheus self-monitoring

Retention: 15 days default, configurable
Expand Down Expand Up @@ -182,7 +182,7 @@ labels:
- "traefik.enable=true"
- "traefik.http.routers.abada.rule=PathPrefix(`/abada`)"
- "traefik.http.services.abada.loadbalancer.server.port=5601"
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/abada/api/actuator/health"
- "traefik.http.services.abada.loadbalancer.healthcheck.path=/api/actuator/health"
```

### Database Connection Pooling
Expand All @@ -193,7 +193,7 @@ Each engine instance maintains its own connection pool (HikariCP). PostgreSQL co

### Health Checks
All services have health checks:
- Abada Engine: `/abada/api/actuator/health`
- Abada Engine: `/api/actuator/health`
- PostgreSQL: `pg_isready`
- OTEL Collector: internal health extension
- Prometheus/Grafana/Jaeger: HTTP endpoints
Expand Down
12 changes: 6 additions & 6 deletions docs/operations/docker-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ docker compose -f docker-compose.yml -f docker-compose.dev.yml up

**Access URLs:**

- Abada Engine: <http://localhost:5601/abada/api>
- Abada Engine: <http://localhost:5601/api>
- Abada Tenda: <http://localhost:5602>
- Abada Orun: <http://localhost:5603>
- H2 Console: <http://localhost:5601/abada/api/h2-console>
- H2 Console: <http://localhost:5601/api/h2-console>
- Grafana: <http://localhost:3000> (admin/admin123)
- Jaeger: <http://localhost:16686>
- Prometheus: <http://localhost:9090>
Expand All @@ -112,7 +112,7 @@ docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d

**Access URLs:**

- Abada Engine: <http://localhost/abada/api> (via Traefik)
- Abada Engine: <http://localhost/api> (via Traefik)
- Traefik Dashboard: <http://localhost:8080>
- Grafana: <http://localhost:3000>
- Jaeger: <http://localhost:16686>
Expand Down Expand Up @@ -165,7 +165,7 @@ If you prefer to start it manually:

### Access URLs

- **Abada Engine**: <http://localhost/abada/api> (via Traefik)
- **Abada Engine**: <http://localhost/api> (via Traefik)
- **Abada Tenda**: <http://localhost:5602>
- **Abada Orun**: <http://localhost:5603>
- **Grafana**: <http://localhost:3000>
Expand Down Expand Up @@ -224,7 +224,7 @@ Pre-configured dashboards available in Grafana:
Production environment uses Traefik for load balancing:

- **Strategy**: Round-robin
- **Health Checks**: `/abada/api/actuator/health`
- **Health Checks**: `/api/actuator/health`
- **Path**: `/abada` prefix
- **Sticky Sessions**: Disabled (stateless design)

Expand Down Expand Up @@ -397,7 +397,7 @@ docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d
docker-compose ps

# Check specific service health
curl http://localhost:5601/abada/api/actuator/health
curl http://localhost:5601/api/actuator/health
```

## Support
Expand Down
6 changes: 3 additions & 3 deletions docs/operations/sample-data-generator.md
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ services:
- abada-network
restart: unless-stopped
healthcheck:
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/abada/api/actuator/health" ]
test: [ "CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:5601/api/actuator/health" ]
interval: 30s
timeout: 10s
retries: 3
Expand Down Expand Up @@ -386,11 +386,11 @@ docker logs abada-engine | grep "Sample Data"
# Sample Data Generation Complete

# Verify via API
curl http://localhost:5601/abada/api/v1/processes/instances
curl http://localhost:5601/api/v1/processes/instances

# Check tasks
curl -H "X-User: alice" -H "X-Groups: customers" \
http://localhost:5601/abada/api/v1/tasks
http://localhost:5601/api/v1/tasks
```

## Important Notes
Expand Down
10 changes: 6 additions & 4 deletions release/docker-compose.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ services:
condition: service_healthy
required: true
deploy:
replicas: 3
replicas: 1
resources:
limits:
cpus: 1
Expand Down Expand Up @@ -41,17 +41,19 @@ services:
- --no-verbose
- --tries=1
- --spider
- http://localhost:5601/abada/api/actuator/health
- http://localhost:5601/api/actuator/health
timeout: 10s
interval: 30s
retries: 3
image: bashizip/abada-engine:0.8.4-alpha
labels:
traefik.enable: "true"
traefik.http.routers.abada.rule: PathPrefix(`/abada`)
traefik.http.routers.abada.rule: PathPrefix(`/api`)
traefik.http.services.abada.loadbalancer.healthcheck.interval: 30s
traefik.http.services.abada.loadbalancer.healthcheck.path: /abada/api/actuator/health
traefik.http.services.abada.loadbalancer.healthcheck.path: /api/actuator/health
traefik.http.services.abada.loadbalancer.server.port: "5601"
ports:
- "5601:5601"
networks:
abada-network: null
pull_policy: always
Expand Down
2 changes: 1 addition & 1 deletion release/quickstart.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ start_platform() {
if [ $? -eq 0 ]; then
echo ""
print_step "Platform available at:"
echo -e " - ${BLUE}Engine ${NC}: http://localhost/abada/api"
echo -e " - ${BLUE}Engine ${NC}: http://localhost:5601/api/"
echo -e " - ${BLUE}Tenda ${NC}: http://localhost:5602"
echo -e " - ${BLUE}Orun ${NC}: http://localhost:5603"
echo -e " - ${BLUE}Grafana ${NC}: http://localhost:3000"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-and-run-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ sleep 10

echo -e "\n${GREEN}✓ Stack is up!${NC}"
echo -e "${BLUE}Services:${NC}"
echo -e "- Abada Engine: http://localhost:5601/abada/api"
echo -e "- Abada Engine: http://localhost:5601/api"
echo -e "- Abada Tenda: http://localhost:5602"
echo -e "- Abada Orun: http://localhost:5603"
echo -e "- Grafana: http://localhost:3000 (admin/admin123)"
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ echo -e "\n${YELLOW}Step 4: Waiting for application to start...${NC}"
sleep 10

echo -e "\n${GREEN}✓ Build complete!${NC}"
echo -e "${BLUE}Application is starting at http://localhost:5601/abada/api${NC}"
echo -e "${BLUE}Application is starting at http://localhost:5601/api${NC}"
echo -e "${BLUE}Jaeger UI: http://localhost:16686${NC}"
echo -e "${BLUE}Grafana: http://localhost:3000${NC}"
echo -e "\n${YELLOW}To view logs:${NC} docker logs -f abada-engine"
Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_traffic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GREEN='\033[0;32m'
BLUE='\033[0;34m'
NC='\033[0m' # No Color

BASE_URL="http://localhost:5601/abada/api"
BASE_URL="http://localhost:5601/api"
ITERATIONS=20

echo -e "${BLUE}Starting traffic generation for Jaeger troubleshooting...${NC}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/prod-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ if [ "$BUILD_ONLY" = "false" ]; then
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d

echo -e "\n${GREEN}✓ Production stack started!${NC}"
echo -e "${BLUE}Application: http://localhost/abada/api (via Traefik)${NC}"
echo -e "${BLUE}Application: http://localhost/api (via Traefik)${NC}"
echo -e "${BLUE}Jaeger UI: http://localhost:16686${NC}"
echo -e "${BLUE}Grafana: http://localhost:3000${NC}"
echo -e "\n${YELLOW}To view logs:${NC} docker-compose -f docker-compose.yml -f docker-compose.prod.yml logs -f"
Expand Down
2 changes: 1 addition & 1 deletion scripts/start-prod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ docker-compose -f docker-compose.yml -f docker-compose.prod.yml ps

echo -e "\n${GREEN}✓ Production stack started!${NC}"
echo -e "\n${BLUE}Service URLs:${NC}"
echo -e " Application: ${YELLOW}http://localhost/abada/api${NC} (via Traefik load balancer)"
echo -e " Application: ${YELLOW}http://localhost/api${NC} (via Traefik load balancer)"
echo -e " Jaeger UI: ${YELLOW}http://localhost:16686${NC}"
echo -e " Grafana: ${YELLOW}http://localhost:3000${NC} (admin/admin)"
echo -e " Prometheus: ${YELLOW}http://localhost:9090${NC}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-health.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Check health of key services

echo "Checking Abada Engine Health..."
curl -s http://localhost:5601/abada/api/actuator/health | jq . || echo "Engine not reachable"
curl -s http://localhost:5601/api/actuator/health | jq . || echo "Engine not reachable"

echo -e "\n\nChecking Abada Tenda Health..."
curl -I -s http://localhost:5602 || echo "Tenda not reachable"
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spring:
server:
port: ${SERVER_PORT:5601} # Uses 5601 unless overridden by env var
servlet:
context-path: /abada/api
context-path: /api

# Logging Configuration
logging:
Expand Down
4 changes: 2 additions & 2 deletions src/test/http/task.http
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
### Send POST request with json body
POST http://localhost:5601/abada/api/v1/tasks/claim?taskId=eea72b83-e1f8-4707-ad6c-f679ca6bb5bb
POST http://localhost:5601/api/v1/tasks/claim?taskId=eea72b83-e1f8-4707-ad6c-f679ca6bb5bb
Content-Type: application/json
X-User: alice
X-Groups: customers


### Send Get request with json body
GET http://localhost:5601/abada/api/v1/tasks/
GET http://localhost:5601/api/v1/tasks/
Content-Type: application/json
X-User: alice
X-Groups: customers
Loading