Skip to content

Commit 56f4685

Browse files
dependabot[bot]duanhongyi
authored andcommitted
chore(deps): bump aiohttp from 3.8.6 to 3.9.0 in /rootfs (#107)
Bumps [aiohttp](https://github.com/aio-libs/aiohttp) from 3.8.6 to 3.9.0. - [Release notes](https://github.com/aio-libs/aiohttp/releases) - [Changelog](https://github.com/aio-libs/aiohttp/blob/master/CHANGES.rst) - [Commits](aio-libs/aiohttp@v3.8.6...v3.9.0) --- updated-dependencies: - dependency-name: aiohttp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 010efe7 commit 56f4685

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

charts/controller/templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ env:
147147
name: prometheus-creds
148148
key: password
149149
- name: "DRYCC_PROMETHEUS_URL"
150-
value: "http://$(DRYCC_PROMETHEUS_USERNAME):$(DRYCC_PROMETHEUS_PASSWORD)@drycc-prometheus.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:9090//api/v1/query"
150+
value: "http://$(DRYCC_PROMETHEUS_USERNAME):$(DRYCC_PROMETHEUS_PASSWORD)@drycc-prometheus.{{$.Release.Namespace}}.svc.{{$.Values.global.clusterDomain}}:9090"
151151
{{- end }}
152152
{{- if (.Values.rabbitmqUrl) }}
153153
- name: DRYCC_RABBITMQ_URL

rootfs/api/monitor.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import requests
22
from typing import Iterator, Dict
33
from contextlib import closing
4+
from urllib.parse import urljoin
45
from django.db import connections
56
from django.conf import settings
67

@@ -104,15 +105,16 @@
104105

105106

106107
query_loadbalancer_promql_tpl = """
107-
max_over_time(kube_service_status_load_balancer_ingress{namespace=~"%s"}[60m])
108+
kube_service_status_load_balancer_ingress{namespace=~"%s"}
108109
"""
109110

110111

111112
def query_loadbalancer(namespaces: Iterator[str],
112113
start: int, stop: int) -> Iterator[Dict[str, str]]:
113114
promql = query_loadbalancer_promql_tpl % "|".join(namespaces)
114115
params = {"query": promql, "start": start, "end": stop}
115-
response = requests.get(settings.DRYCC_PROMETHEUS_URL, params=params)
116+
response = requests.get(
117+
urljoin(settings.DRYCC_PROMETHEUS_URL, "/api/v1/query"), params=params)
116118
if response.status_code != 200:
117119
return StopIteration
118120
yield from (metric["metric"] for metric in response.json()["data"]["result"])

rootfs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
backoff==2.2.1
33
django==4.2.7
44
channels==4.0.0
5-
aiohttp==3.8.6
5+
aiohttp==3.9.0
66
django-cors-headers==4.1.0
77
django-guardian==2.4.0
88
djangorestframework==3.14.0

0 commit comments

Comments
 (0)