Skip to content

Commit 7f84b71

Browse files
naman22anaman22a
committed
feat: grafana
1 parent 59badc4 commit 7f84b71

File tree

11 files changed

+46
-58
lines changed

11 files changed

+46
-58
lines changed

‎.github/workflows/cd.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ on:
66
types:
77
- completed
88

9-
jobs:
10-
deploy:
11-
runs-on: ubuntu-latest
12-
13-
steps:
14-
- name: Checkout
15-
uses: actions/checkout@v3
16-
17-
- name: Deploy to Server
18-
uses: appleboy/ssh-action@v0.1.10
19-
with:
20-
host: ${{ secrets.SERVER_HOST }}
21-
username: ${{ secrets.SERVER_USER }}
22-
key: ${{ secrets.SERVER_PRIVATE_KEY }}
23-
script: |
24-
echo "Pulling latest images from DockerHub..."
25-
26-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-api-gateway:latest
27-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-users-service:latest
28-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-auth-service:latest
29-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-problems-service:latest
30-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-tags-service:latest
31-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-companies-service:latest
32-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-submissions-service:latest
33-
docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-execution-service:latest
34-
35-
echo "Restarting services..."
36-
37-
cd ~/leetcode-microservices
38-
39-
docker compose down
40-
docker compose up -d
41-
42-
echo "Deployment completed successfully!"
9+
# jobs:
10+
# deploy:
11+
# runs-on: ubuntu-latest
12+
13+
# steps:
14+
# - name: Checkout
15+
# uses: actions/checkout@v3
16+
17+
# - name: Deploy to Server
18+
# uses: appleboy/ssh-action@v0.1.10
19+
# with:
20+
# host: ${{ secrets.SERVER_HOST }}
21+
# username: ${{ secrets.SERVER_USER }}
22+
# key: ${{ secrets.SERVER_PRIVATE_KEY }}
23+
# script: |
24+
# echo "Pulling latest images from DockerHub..."
25+
26+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-api-gateway:latest
27+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-users-service:latest
28+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-auth-service:latest
29+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-problems-service:latest
30+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-tags-service:latest
31+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-companies-service:latest
32+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-submissions-service:latest
33+
# docker pull ${{ secrets.DOCKER_USERNAME }}/leetcode-execution-service:latest
34+
35+
# echo "Restarting services..."
36+
37+
# cd ~/leetcode-microservices
38+
39+
# docker compose down
40+
# docker compose up -d
41+
42+
# echo "Deployment completed successfully!"

‎apps/api-gateway/src/main.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { NestFactory } from '@nestjs/core';
22
import { AppModule } from './app.module';
3-
import { ValidationPipe } from '@nestjs/common';
3+
import { RequestMethod, ValidationPipe } from '@nestjs/common';
44
import { exceptionFactory } from './validation';
55
import cookieParser from 'cookie-parser';
66
import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
@@ -50,7 +50,9 @@ async function bootstrap() {
5050
optionsSuccessStatus: 204,
5151
});
5252

53-
app.setGlobalPrefix('api');
53+
app.setGlobalPrefix('api', {
54+
exclude: [{ path: 'metrics', method: RequestMethod.GET }],
55+
});
5456

5557
// SWAGGER
5658
const config = new DocumentBuilder().setTitle('Leetcode API').setVersion('1.0').build();

‎apps/auth-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { MailModule } from './mail/mail.module';
44
import { ConfigModule } from '@nestjs/config';
55
import { configuration, validate } from '@leetcode/config';
66
import { DatabaseModule } from '@leetcode/database';
7-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
87

98
@Module({
109
imports: [
@@ -18,7 +17,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
1817
DatabaseModule,
1918
AuthModule,
2019
MailModule,
21-
PrometheusModule.register(),
2220
],
2321
controllers: [],
2422
providers: [],

‎apps/companies-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { DatabaseModule } from '@leetcode/database';
33
import { Module } from '@nestjs/common';
44
import { ConfigModule } from '@nestjs/config';
55
import { CompaniesController } from './companies/companies.controller';
6-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
76

87
@Module({
98
imports: [
@@ -15,7 +14,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
1514
validate,
1615
}),
1716
DatabaseModule,
18-
PrometheusModule.register(),
1917
],
2018
controllers: [CompaniesController],
2119
providers: [],

‎apps/execution-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Configuration, configuration, validate } from '@leetcode/config';
55
import { DatabaseModule } from '@leetcode/database';
66
import { ExecutionConsumer } from './execution/execution.worker';
77
import { BullModule } from '@nestjs/bullmq';
8-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
98

109
@Module({
1110
imports: [
@@ -33,7 +32,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
3332
BullModule.registerQueue({
3433
name: 'results-queue',
3534
}),
36-
PrometheusModule.register(),
3735
],
3836
controllers: [],
3937
providers: [ExecutionService, ExecutionConsumer],

‎apps/problems-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { DatabaseModule } from '@leetcode/database';
44
import { ConfigModule } from '@nestjs/config';
55
import { configuration, validate } from '@leetcode/config';
66
import { ProblemsService } from './problems/problems.service';
7-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
87

98
@Module({
109
imports: [
@@ -16,7 +15,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
1615
validate,
1716
}),
1817
DatabaseModule,
19-
PrometheusModule.register(),
2018
],
2119
controllers: [ProblemsController],
2220
providers: [ProblemsService],

‎apps/submissions-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { ConfigModule, ConfigService } from '@nestjs/config';
55
import { Configuration, configuration, validate } from '@leetcode/config';
66
import { BullModule } from '@nestjs/bullmq';
77
import { ResultsConsumer } from './submissions/submissions.worker';
8-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
98

109
@Module({
1110
imports: [
@@ -33,7 +32,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
3332
BullModule.registerQueue({
3433
name: 'notifications-queue',
3534
}),
36-
PrometheusModule.register(),
3735
],
3836
controllers: [SubmissionsController],
3937
providers: [ResultsConsumer],

‎apps/tags-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { DatabaseModule } from '@leetcode/database';
33
import { Module } from '@nestjs/common';
44
import { ConfigModule } from '@nestjs/config';
55
import { TagsController } from './tags/tags.controller';
6-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
76

87
@Module({
98
imports: [
@@ -15,7 +14,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
1514
validate,
1615
}),
1716
DatabaseModule,
18-
PrometheusModule.register(),
1917
],
2018
controllers: [TagsController],
2119
providers: [],

‎apps/users-service/src/app.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { UsersController } from './users/users.controller';
33
import { DatabaseModule } from '@leetcode/database';
44
import { ConfigModule } from '@nestjs/config';
55
import { configuration, validate } from '@leetcode/config';
6-
import { PrometheusModule } from '@willsoto/nestjs-prometheus';
76

87
@Module({
98
imports: [
@@ -15,7 +14,6 @@ import { PrometheusModule } from '@willsoto/nestjs-prometheus';
1514
validate,
1615
}),
1716
DatabaseModule,
18-
PrometheusModule.register(),
1917
],
2018
controllers: [UsersController],
2119
providers: [],

‎docker-compose.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,13 @@ services:
340340
volumes:
341341
- ./prometheus.yml:/etc/prometheus/prometheus.yml
342342

343+
grafana:
344+
image: grafana/grafana-oss
345+
container_name: grafana
346+
ports:
347+
- "3001:3000"
348+
restart: unless-stopped
349+
343350
volumes:
344351
pgdata:
345352
redis-data:

0 commit comments

Comments
 (0)