fix: fix errors caused by changes in immich API and fix build fails

This commit is contained in:
Oleksiy Fomenko
2024-06-13 11:37:26 -04:00
parent f7a2b9d947
commit fce6d437c5
2 changed files with 16 additions and 22 deletions

View File

@@ -3,14 +3,14 @@ FROM alpine:3.18.4
# Installing required packages # Installing required packages
FROM alpine/doctl FROM alpine/doctl
ENV PYTHONUNBUFFERED=1 ENV PYTHONUNBUFFERED=1
RUN apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python RUN apk add --update --no-cache python3 py-pip && ln -sf python3 /usr/bin/python
RUN python3 -m ensurepip #RUN python3 -m ensurepip
RUN pip3 install --no-cache --upgrade pip setuptools RUN pip3 install --break-system-packages --no-cache --upgrade pip setuptools
# Install package # Install package
WORKDIR /code WORKDIR /code
COPY . . COPY . .
RUN pip3 install . RUN pip3 install --break-system-packages .
ENV IMMICH_API_TOKEN="" ENV IMMICH_API_TOKEN=""
ENV IMMICH_HOST="" ENV IMMICH_HOST=""

View File

@@ -43,7 +43,7 @@ class ImmichMetricsCollector:
metrics = [] metrics = []
metrics.extend(self.get_immich_server_version_number()) metrics.extend(self.get_immich_server_version_number())
metrics.extend(self.get_immich_server_info()) metrics.extend(self.get_immich_storage())
metrics.extend(self.get_immich_users_stat) metrics.extend(self.get_immich_users_stat)
metrics.extend(self.get_immich_users_stat_growth()) metrics.extend(self.get_immich_users_stat_growth())
@@ -131,16 +131,13 @@ class ImmichMetricsCollector:
for x in range(0, user_count): for x in range(0, user_count):
metrics.append( metrics.append(
{ {
"name": f"{self.config['metrics_prefix']}_server_stats_photos_by_users", "name": f"{self.config['metrics_prefix']}_server_stats_photos_by_users",
"value": user_data[x]['photos'], "value": user_data[x]['photos'],
"labels": { "labels": {
"firstName": user_data[x]["userName"].split()[0], "firstName": user_data[x]["userName"].split()[0],
}, },
"help": f"Number of photos by user {user_data[x]['userName'].split()[0]} " "help": f"Number of photos by user {user_data[x]['userName'].split()[0]} "
} }
) )
@@ -152,10 +149,8 @@ class ImmichMetricsCollector:
"value": user_data[x]['videos'], "value": user_data[x]['videos'],
"labels": { "labels": {
"firstName": user_data[x]["userName"].split()[0], "firstName": user_data[x]["userName"].split()[0],
}, },
"help": f"Number of photos by user {user_data[x]['userName'].split()[0]} " "help": f"Number of photos by user {user_data[x]['userName'].split()[0]} "
} }
) )
# usage # usage
@@ -166,49 +161,48 @@ class ImmichMetricsCollector:
"value": (user_data[x]['usage']), "value": (user_data[x]['usage']),
"labels": { "labels": {
"firstName": user_data[x]["userName"].split()[0], "firstName": user_data[x]["userName"].split()[0],
}, },
"help": f"Number of photos by user {user_data[x]['userName'].split()[0]} " "help": f"Number of photos by user {user_data[x]['userName'].split()[0]} "
} }
) )
return metrics return metrics
def get_immich_server_info(self): def get_immich_storage(self):
try: try:
endpoint_server_info = "/api/server-info" endpoint_storage = "/api/server-info/storage"
response_server_info = requests.request( response_storage = requests.request(
"GET", "GET",
self.combine_url(endpoint_server_info), self.combine_url(endpoint_storage),
headers={'Accept': 'application/json', headers={'Accept': 'application/json',
"x-api-key": self.config["token"]} "x-api-key": self.config["token"]}
) )
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
logger.error(f"Couldn't get server version: {e}") logger.error(f"Couldn't get storage info: {e}")
response_json = response_storage.json()
return [ return [
{ {
"name": f"{self.config['metrics_prefix']}_server_info_diskAvailable", "name": f"{self.config['metrics_prefix']}_server_info_diskAvailable",
"value": (response_server_info.json()["diskAvailableRaw"]), "value": (response_json["diskAvailableRaw"]),
"help": "Available space on disk", "help": "Available space on disk",
}, },
{ {
"name": f"{self.config['metrics_prefix']}_server_info_totalDiskSize", "name": f"{self.config['metrics_prefix']}_server_info_totalDiskSize",
"value": (response_server_info.json()["diskSizeRaw"]), "value": (response_json["diskSizeRaw"]),
"help": "total disk size", "help": "total disk size",
# "type": "counter" # "type": "counter"
}, },
{ {
"name": f"{self.config['metrics_prefix']}_server_info_diskUse", "name": f"{self.config['metrics_prefix']}_server_info_diskUse",
"value": (response_server_info.json()["diskUseRaw"]), "value": (response_json["diskUseRaw"]),
"help": "disk space in use", "help": "disk space in use",
# "type": "counter" # "type": "counter"
}, },
{ {
"name": f"{self.config['metrics_prefix']}_server_info_diskUsagePercentage", "name": f"{self.config['metrics_prefix']}_server_info_diskUsagePercentage",
"value": (response_server_info.json()["diskUsagePercentage"]), "value": (response_json["diskUsagePercentage"]),
"help": "disk usage in percent", "help": "disk usage in percent",
# "type": "counter" # "type": "counter"
} }