Merge branch 'immich-app:main' into main

.github/workflows/prepare-release.yml

@@ -4,16 +4,16 @@ on:
   workflow_dispatch:
     inputs:
       serverBump:
-        description: "Bump server version"
+        description: 'Bump server version'
         required: true
-        default: "false"
+        default: 'false'
         type: choice
         options:
-          - "false"
+          - 'false'
           - minor
           - patch
       mobileBump:
-        description: "Bump mobile build number"
+        description: 'Bump mobile build number'
         required: false
         type: boolean
 
@@ -46,8 +46,8 @@ jobs:
         with:
           author_name: Alex The Bot
           author_email: [email protected]
-          default_author: user_info 
-          message: "Version ${{ env.IMMICH_VERSION }}"
+          default_author: user_info
+          message: 'Version ${{ env.IMMICH_VERSION }}'
           tag: ${{ env.IMMICH_VERSION }}
           push: true
 
@@ -85,4 +85,5 @@ jobs:
             docker/example.env
             docker/hwaccel.ml.yml
             docker/hwaccel.transcoding.yml
+            docker/prometheus.yml
             *.apk

docs/docs/features/monitoring.md

@@ -0,0 +1,113 @@
+# Monitoring
+
+## Overview
+
+Immich provides a variety of performance metrics to allow for local monitoring and insights. This integration is primarily in the form of Prometheus metrics. However, exporting traces is also possible due to the use of OpenTelemetry instrumentation.
+
+:::note
+This is an opt-in feature intended for you to monitor immich's performance. This data isn't sent anywhere beyond what you've configured.
+:::
+
+## Prometheus
+
+Prometheus is a tool that collects metrics from a number of sources you configure. It operates in a "pull" strategy - that is, it periodically requests metrics from each defined source. This means that the source doesn't send anything until it's requested. It also means that the source -- immich, in this case -- has to expose an endpoint for Prometheus to target when it requests metrics.
+
+### Metrics
+
+These metrics come in a variety of forms:
+
+- Counters, which can only increase. Example: the number of times an endpoint has been called.
+- Gauges, which can increase or decrease within a certain range. Example: CPU utilization.
+- Histograms, where each observation is assigned to a certain number of "buckets". Example: response time, where each bucket is a number of milliseconds. This one is a bit more complicated.
+  - Buckets in this case are _cumulative_; that is, an observation is placed not only into the smallest bucket that contains it, but also to all buckets larger than this. For example, if a histogram has three buckets for 1ms, 5ms and 10ms, an observation of 3ms will be bucketed into both 5ms and 10ms.
+
+The metrics in immich are grouped into API (endpoint calls and response times), host (memory and CPU utilization), and IO (internal database queries, image processing, and so on). Each group of metrics can be enabled or disabled independently.
+
+### Configuration
+
+Immich will not expose an endpoint for metrics by default. To enable this endpoint, you can add the `IMMICH_METRICS=true` environmental variable to your `.env` file. Note that only the server and microservices containers currently use this variable.
+
+:::note
+`IMMICH_METRICS` is equivalent to enabling the following three environmental variables: `IMMICH_API_METRICS`, `IMMICH_HOST_METRICS`, and `IMMICH_IO_METRICS`. If you would like to only expose certain kinds of metrics, you can set only those environmental variables to `true`. Explicitly setting the environmental variable for a metric group overrides `IMMICH_METRICS` for that group.
+:::
+
+The next step is to configure a new or existing Prometheus instance to scrape this endpoint. The following steps assume that you do not have an existing Prometheus instance, but the steps will be similar either way.
+
+You can start by defining a Prometheus service in the Compose file:
+
+```yaml
+immich-prometheus:
+  container_name: immich_prometheus
+  ports:
+    # this exposes the default port for Prometheus so you can interact with it
+    - 9090:9090
+  image: prom/prometheus
+  volumes:
+    # the Prometheus configuration file - a barebones one is provided to get started
+    - ./prometheus.yml:/etc/prometheus/prometheus.yml
+    # a named volume defined in the bottom of the Compose file; it can also be a mounted folder
+    - prometheus-data:/prometheus
+```
+
+You will also need to add `prometheus-data` to the list of volumes in the bottom of the Compose file:
+
+```yaml
+volumes:
+  model-cache:
+  prometheus-data:
+```
+
+The last piece is the [configuration file][prom-file]. This file defines (among other things) the sources Prometheus should target. Download it and place it in the same folder as the Compose file.
+
+:::tip
+The provided file is just a starting point. There are a ton of ways to configure Prometheus, so feel free to experiment!
+:::
+
+After bringing down the containers with `docker compose down` and back up with `docker compose up -d`, a Prometheus instance will now collect metrics from the immich server and microservices containers. Note that we didn't need to expose any new ports for these containers - the communication is handled in the internal Docker network.
+
+:::note
+To see exactly what metrics are made available, you can additionally add `8081:8081` to the server container's ports and `8082:8081` to the microservices container's ports. Visiting the `/metrics` endpoint for these services will show the same raw data that Prometheus collects.
+:::
+
+### Usage
+
+So after setting up Prometheus, how do you actually view the metrics? The simplest way is to use Prometheus directly. Visiting Prometheus will show you a web UI where you can search for and visualize metrics. You can also view the status of your data sources and configure settings, but this is beyond the scope of this guide.
+
+## Grafana
+
+For a dedicated tool with nice presentation, you can use Grafana instead. This connects to Prometheus (and possibly other sources) for sophisticated data visualization.
+
+Setting up Grafana is similar to Prometheus. You can add a service for it:
+
+```yaml
+immich-grafana:
+  container_name: immich_grafana
+  command: ['./run.sh', '-disable-reporting'] # this is to disable Grafana's telemetry
+  ports:
+    - 3000:3000
+  image: grafana/grafana
+  volumes:
+    # stores your pretty dashboards and panels
+    - grafana-data:/var/lib/grafana
+```
+
+And add another volume for it:
+
+```yaml
+volumes:
+  model-cache:
+  prometheus-data:
+  grafana-data:
+```
+
+After bringing down the services and back up again, you can now visit Grafana to view your metrics. On the first login, enter `admin` for both username and password and update your password. You can then go to the settings and add a data source with `http://immich-prometheus:9090` to point Grafana to your Prometheus instance.
+
+### Usage
+
+You can make your first dashboard to get started. Don't forget to save it frequently, or you'll lose all your progress!
+
+You can then make a new panel, specifying Prometheus as the data source for it.
+
+-- TODO: add images and more details here
+
+[prom-file]: https://github.com/immich-app/immich/releases/latest/download/prometheus.yml

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.98.2",
+  "version": "1.99.0",
   "description": "",
   "main": "index.js",
   "type": "module",

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.98.2"
+version = "1.99.0"
 description = ""
 authors = ["Hau Tran <[email protected]>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 128,
-        "android.injected.version.name" => "1.98.2",
+        "android.injected.version.code" => 129,
+        "android.injected.version.name" => "1.99.0",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/android/fastlane/report.xml

@@ -5,17 +5,17 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000208">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00024">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="76.932126">
+      <testcase classname="fastlane.lanes" name="1: bundleRelease" time="81.32752">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="33.616364">
+      <testcase classname="fastlane.lanes" name="2: upload_to_play_store" time="26.041597">
 
       </testcase>
 

mobile/assets/i18n/en-US.json

@@ -190,6 +190,7 @@
   "exif_bottom_sheet_location": "LOCATION",
   "exif_bottom_sheet_location_add": "Add a location",
   "exif_bottom_sheet_people": "PEOPLE",
+  "exif_bottom_sheet_person_add_person": "Add name",
   "experimental_settings_new_asset_list_subtitle": "Work in progress",
   "experimental_settings_new_asset_list_title": "Enable experimental photo grid",
   "experimental_settings_subtitle": "Use at your own risk!",

mobile/ios/Runner.xcodeproj/project.pbxproj

@@ -383,7 +383,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 144;
+				CURRENT_PROJECT_VERSION = 145;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -525,7 +525,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 144;
+				CURRENT_PROJECT_VERSION = 145;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -553,7 +553,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 144;
+				CURRENT_PROJECT_VERSION = 145;
 				DEVELOPMENT_TEAM = 2F67MQ8R79;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

mobile/ios/Runner/Info.plist

@@ -55,11 +55,11 @@
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.98.2</string>
+		<string>1.99.0</string>
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleVersion</key>
-		<string>144</string>
+		<string>145</string>
 		<key>FLTEnableImpeller</key>
 		<true/>
 		<key>ITSAppUsesNonExemptEncryption</key>

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Beta"
   lane :beta do
     increment_version_number(
-      version_number: "1.98.2"
+      version_number: "1.99.0"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/ios/fastlane/report.xml

@@ -5,32 +5,32 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000232">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000246">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.745911">
+      <testcase classname="fastlane.lanes" name="1: increment_version_number" time="0.175843">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="4.672711">
+      <testcase classname="fastlane.lanes" name="2: latest_testflight_build_number" time="6.871371">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.171883">
+      <testcase classname="fastlane.lanes" name="3: increment_build_number" time="0.189451">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="4: build_app" time="112.172167">
+      <testcase classname="fastlane.lanes" name="4: build_app" time="142.078248">
 
       </testcase>
 
 
-      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="98.918418">
+      <testcase classname="fastlane.lanes" name="5: upload_to_testflight" time="78.774821">
 
       </testcase>
 

mobile/lib/modules/asset_viewer/ui/exif_sheet/exif_map.dart

@@ -64,7 +64,7 @@ class ExifMap extends StatelessWidget {
     }
 
     return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 16.0),
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
       child: LayoutBuilder(
         builder: (context, constraints) {
           return MapThumbnail(

mobile/lib/modules/search/ui/curated_people_row.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:easy_localization/easy_localization.dart';
 import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/search/models/curated_content.dart';
 import 'package:immich_mobile/modules/search/ui/thumbnail_with_info.dart';
@@ -23,7 +24,7 @@ class CuratedPeopleRow extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    const imageSize = 80.0;
+    const imageSize = 70.0;
 
     // Guard empty [content]
     if (content.isEmpty) {
@@ -82,11 +83,11 @@ class CuratedPeopleRow extends StatelessWidget {
                     child: Padding(
                       padding: const EdgeInsets.only(top: 8.0),
                       child: Text(
-                        "Add name",
+                        "exif_bottom_sheet_person_add_person",
                         style: context.textTheme.labelLarge?.copyWith(
                           color: context.primaryColor,
                         ),
-                      ),
+                      ).tr(),
                     ),
                   )
                 else

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.98.2+128
+version: 1.99.0+129
 isar_version: &isar_version 3.1.0+1
 
 environment:

open-api/immich-openapi-specs.json

@@ -6538,7 +6538,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.98.2",
+    "version": "1.99.0",
     "contact": {}
   },
   "tags": [],