Skip to content

Commit cb800db

Browse files
committed
Удалён django_prometheus и вычищены legacy-конфиги observability
1 parent 0f6715e commit cb800db

8 files changed

Lines changed: 46 additions & 160 deletions

File tree

docker-compose.yml

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,13 @@ services:
1717
expose:
1818
- 8000
1919

20-
grafana:
21-
image: grafana/grafana-enterprise
22-
container_name: grafana
23-
restart: unless-stopped
24-
ports:
25-
- '3000:3000'
26-
volumes:
27-
- grafana-storage:/var/lib/grafana
28-
29-
30-
prometheus:
31-
container_name: prometheus
32-
image: prom/prometheus:v2.36.0
33-
ports:
34-
- '9090:9090'
35-
volumes:
36-
- prom-data:/prometheus
37-
- ./prometheus:/etc/prometheus
38-
39-
4020
nginx:
4121
container_name: nginx
4222
build: ./nginx
4323
depends_on:
4424
- web
4525
ports:
4626
- "8000:80"
47-
# todo: настроим позже
48-
# loki:
49-
# image: grafana/loki:2.9.0
50-
# ports:
51-
# - "3100:3100"
52-
# command: -config.file=/etc/loki/local-config.yaml
53-
#
54-
# promtail:
55-
# image: grafana/promtail:2.9.0
56-
# volumes:
57-
# - /var/log:/var/log
58-
# - ./promtail:/etc/promtail
59-
# - ./log:/procollab/log
60-
# command: -config.file=/etc/promtail/config.yml
6127

6228
redis:
6329
container_name: redis
@@ -83,11 +49,5 @@ services:
8349
- .:/procollab
8450

8551
volumes:
86-
grafana-data:
87-
grafana-configs:
88-
prom-data:
89-
prom-configs:
9052
log:
91-
promtail:
9253
redis-data:
93-
grafana-storage: {}

loki/loki-config.yaml

Lines changed: 0 additions & 50 deletions
This file was deleted.

poetry.lock

Lines changed: 43 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

procollab/settings.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,9 @@
113113
"drf_yasg",
114114
"channels",
115115
"taggit",
116-
"django_prometheus",
117116
]
118117

119118
MIDDLEWARE = [
120-
"django_prometheus.middleware.PrometheusBeforeMiddleware",
121119
"django.middleware.security.SecurityMiddleware",
122120
"corsheaders.middleware.CorsMiddleware",
123121
"whitenoise.middleware.WhiteNoiseMiddleware",
@@ -128,7 +126,6 @@
128126
"django.contrib.messages.middleware.MessageMiddleware",
129127
"django.middleware.clickjacking.XFrameOptionsMiddleware",
130128
"debug_toolbar.middleware.DebugToolbarMiddleware",
131-
"django_prometheus.middleware.PrometheusAfterMiddleware",
132129
"core.log.middleware.CustomLoguruMiddleware",
133130
]
134131

@@ -189,7 +186,7 @@
189186
if DEBUG:
190187
DATABASES = {
191188
"default": {
192-
"ENGINE": "django_prometheus.db.backends.sqlite3",
189+
"ENGINE": "django.db.backends.sqlite3",
193190
"NAME": "db.sqlite3",
194191
}
195192
}
@@ -215,7 +212,7 @@
215212
else:
216213
CACHES = {
217214
"default": {
218-
"BACKEND": "django_prometheus.cache.backends.filebased.FileBasedCache",
215+
"BACKEND": "django.core.cache.backends.filebased.FileBasedCache",
219216
"LOCATION": config(
220217
"DJANGO_FILE_CACHE_DIR",
221218
default=str(BASE_DIR / ".cache" / "django_cache"),
@@ -251,7 +248,7 @@
251248

252249
DATABASES = {
253250
"default": {
254-
"ENGINE": "django_prometheus.db.backends.postgresql",
251+
"ENGINE": "django.db.backends.postgresql",
255252
"NAME": config("DATABASE_NAME", default="postgres", cast=str),
256253
"USER": config("DATABASE_USER", default="postgres", cast=str),
257254
"PASSWORD": config("DATABASE_PASSWORD", default="postgres", cast=str),

procollab/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
path("api/token/refresh/", TokenRefreshView.as_view(), name="token_refresh"),
5555
path("api/token/verify/", TokenVerifyView.as_view(), name="token_verify"),
5656
path("", include("metrics.urls", namespace="metrics")),
57-
path("django_prometheus/", include("django_prometheus.urls")),
5857
path("anymail/", include("anymail.urls")),
5958
]
6059

prometheus/prometheus.yml

Lines changed: 0 additions & 10 deletions
This file was deleted.

promtail/config.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ django-taggit = "^3.1.0"
5757
requests = "^2.31.0"
5858
coreapi = "^2.3.3"
5959
webp = "^0.1.6"
60-
django-prometheus = "^2.3.1"
6160
loguru = "^0.7.1"
6261
tablib = {extras = ["xlsx"], version = "^3.5.0"}
6362
django-redis = "^5.3.0"

0 commit comments

Comments
 (0)