fix: complex service status

service: firefly III
2024-10-22 08:04:19 +02:00 · 2024-02-23 10:09:42 +01:00 · 2024-02-23 10:09:42 +01:00 · 62ae845f4b
commit 62ae845f4b
parent c77f32e696
9 changed files with 164 additions and 45 deletions
--- a/app/Models/Service.php
+++ b/app/Models/Service.php
@ -6,7 +6,6 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Str;

 class Service extends BaseModel
 {
@ -28,47 +27,73 @@ public function tags()
    {
        return $this->morphToMany(Tag::class, 'taggable');
    }
-    public function status() {
-        $foundRunning = false;
-        $isDegraded = false;
-        $foundRestaring = false;
+    public function status()
+    {
        $applications = $this->applications;
        $databases = $this->databases;
+
+        $complexStatus = null;
+        $complexHealth = null;
+
        foreach ($applications as $application) {
            if ($application->exclude_from_status) {
                continue;
            }
-            if (Str::of($application->status)->startsWith('running')) {
-                $foundRunning = true;
-            } else if (Str::of($application->status)->startsWith('restarting')) {
-                $foundRestaring = true;
+            $status = str($application->status)->before('(')->trim();
+            $health = str($application->status)->between('(', ')')->trim();
+            if ($complexStatus === 'degraded') {
+                continue;
+            }
+            if ($status->startsWith('running')) {
+                if ($complexStatus === 'exited') {
+                    $complexStatus = 'degraded';
+                } else {
+                    $complexStatus = 'running';
+                }
+            } else if ($status->startsWith('restarting')) {
+                $complexStatus = 'degraded';
+            } else if ($status->startsWith('exited')) {
+                $complexStatus = 'exited';
+            }
+            if ($health->value() === 'healthy') {
+                if ($complexHealth === 'unhealthy') {
+                    continue;
+                }
+                $complexHealth = 'healthy';
            } else {
-                $isDegraded = true;
+                $complexHealth = 'unhealthy';
            }
        }
        foreach ($databases as $database) {
            if ($database->exclude_from_status) {
                continue;
            }
-            if (Str::of($database->status)->startsWith('running')) {
-                $foundRunning = true;
-            } else if (Str::of($database->status)->startsWith('restarting')) {
-                $foundRestaring = true;
+            $status = str($database->status)->before('(')->trim();
+            $health = str($database->status)->between('(', ')')->trim();
+            if ($complexStatus === 'degraded') {
+                continue;
+            }
+            if ($status->startsWith('running')) {
+                if ($complexStatus === 'exited') {
+                    $complexStatus = 'degraded';
+                } else {
+                    $complexStatus = 'running';
+                }
+            } else if ($status->startsWith('restarting')) {
+                $complexStatus = 'degraded';
+            } else if ($status->startsWith('exited')) {
+                $complexStatus = 'exited';
+            }
+            if ($health->value() === 'healthy') {
+                if ($complexHealth === 'unhealthy') {
+                    continue;
+                }
+                $complexHealth = 'healthy';
            } else {
-                $isDegraded = true;
+                $complexHealth = 'unhealthy';
            }
        }
-        if ($foundRestaring) {
-            return 'degraded';
-        }
-        if ($foundRunning && !$isDegraded) {
-            return 'running';
-        } else if ($foundRunning && $isDegraded) {
-            return 'degraded';
-        } else if (!$foundRunning && !$isDegraded) {
-            return 'exited';
-        }
-        return 'exited';
+        return "{$complexStatus}:{$complexHealth}";
    }
    public function extraFields()
    {
@ -414,7 +439,7 @@ public function link()
    public function documentation()
    {
        $services = getServiceTemplates();
-        $service = data_get($services, Str::of($this->name)->beforeLast('-')->value, []);
+        $service = data_get($services, str($this->name)->beforeLast('-')->value, []);
        return data_get($service, 'documentation', config('constants.docs.base_url'));
    }
    public function applications()
--- a/public/svgs/firefly.svg
+++ b/public/svgs/firefly.svg
@ -0,0 +1,21 @@
+<!--
+  - maskable-icon.svg
+  - Copyright (c) 2022 james@firefly-iii.org
+  -
+  - This file is part of Firefly III (https://github.com/firefly-iii).
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<svg height="377.95276" width="377.95276" xmlns="http://www.w3.org/2000/svg"><path d="m0 0h377.95276v377.95276h-377.95276z" fill="#cd5029" stroke-width="1.96129"/><g transform="matrix(.77452773 0 0 .77452773 21.636074 21.374655)"><path d="m140.49013 78.646381 2.249 53.017999s-40.103 29.566-45.538 68l-16.001 1.231s-11.539 2.564-11.539 14.103v37.18s3.846 11.538 12.82 11.538l16.487-.319s8 30.5 36.5 50.5v25.5s-2 8.5 15.5 11 40.75 2.25 44.5-1.5 3.75-4.5 3.75-9c0 0 21.25 5 60.25 0v5s3.5 7 29 7 33-3 37.5-12v-25s37.009-36.264 35.75-91.75c-1.083-47.75-15.901-64.299-35.806-82.96-22.67-21.254-69.944-31.165-117.944-25.353.001-.001-24.341-43.937999-67.478-36.187999z" fill="#fff"/><circle cx="135.46912" cy="214.39638" fill="#cd5029" r="9.5"/><path d="m360.08113 190.51238s-18.218-8.742-40.662 3.996c0 0-26.711-8.987-40.99 2.593-14.828 12.025-16.299 26.115-15.525 42.785 0 0 12.837-43.915 45.252-32.571 0 0-22.947 40.43 12.761 47.508 0 0 8.436-.05 15.401-4.256 6.644-4.011 11.842-11.433 9.711-24.814 0 0-4.348-13.336-15.569-21.42 0 0 11.042-7.806 31.988-2.209z" fill="#cd5029"/><path d="m320.19013 213.01938s-16.689 31.461 5.607 29.767c0 0 11.838-5.656 4.887-17.127-7.147-11.796-10.494-12.64-10.494-12.64z" fill="#fff"/></g><path d="m188.97638 175.70052s4.01698 13.60604-3.69586 21.52748c-7.713 7.92145-6.8792 16.6767-3.75227 20.84588 3.12692 4.16917 2.91831 7.29593.41674 9.58905-2.50141 2.29312-4.58608 3.96073-6.04523.20846-1.45916-3.75228-3.12676-3.75228-3.75228-5.62834-.62552-1.87605-1.87622-5.21142-1.87622-5.21142s-3.96072 6.25384-6.46229 10.00611c-2.50157 3.75228-2.50141 9.58922-.83381 12.71598 1.66761 3.12676 1.04226 6.87903-.20845 12.09046-1.2507 5.21143.4169 13.13288 6.25369 16.2598 5.83678 3.12692 12.92459 5.62833 16.05135 8.5468s10.42301 5.62833 19.80362 3.54382c9.3806-2.0845 21.26294-11.67355 23.34744-18.13585 0 0 5.41988-6.04523 4.37763-13.96668s-4.79469-7.71316-6.4623-13.75839c-1.6676-6.04523 3.60854-4.55469-.8338-14.93382 0 0-1.98012-4.94005-9.50352-8.49899-4.83404-2.28661-1.54469-12.63061-10.09149-23.05347s-16.73295-12.14688-16.73295-12.14688z" fill="#ffa284" stroke-width=".162598"/></svg>
--- a/resources/views/components/services/navbar.blade.php
+++ b/resources/views/components/services/navbar.blade.php
@ -1,11 +1,11 @@
 <div class="navbar-main" x-data>
-    <a  class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
+    <a class="{{ request()->routeIs('project.service.configuration') ? 'text-white' : '' }}"
        href="{{ route('project.service.configuration', $parameters) }}">
        <button>Configuration</button>
    </a>
    <x-services.links />
    <div class="flex-1"></div>
-    @if ($service->status() === 'degraded')
+    @if (str($service->status())->contains('degraded'))
        <button wire:click='deploy' onclick="startService.showModal()"
            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@ -26,11 +26,10 @@ class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400"
            Stop
        </button>
    @endif
-    @if ($service->status() === 'running')
+    @if (str($service->status())->contains('running'))
        <button wire:click='restart' class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
            <svg class="w-5 h-5 text-warning" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"
-                    stroke-width="2">
+                <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
                    <path d="M19.933 13.041a8 8 0 1 1-9.925-8.788c3.899-1 7.935 1.007 9.425 4.747" />
                    <path d="M20 4v5h-5" />
                </g>
@ -47,7 +46,7 @@ class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400"
            Stop
        </button>
    @endif
-    @if ($service->status() === 'exited')
+    @if (str($service->status())->contains('exited'))
        <button wire:click='stop(true)'
            class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400">
            <svg class="w-5 h-5 " viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
@ -70,9 +69,9 @@ class="flex items-center gap-2 cursor-pointer hover:text-white text-neutral-400"
 </div>

@script
-<script>
-    $wire.on('image-pulled', () => {
-        startService.showModal();
-    });
-</script>
+    <script>
+        $wire.on('image-pulled', () => {
+            startService.showModal();
+        });
+    </script>
@endscript
--- a/resources/views/components/status/degraded.blade.php
+++ b/resources/views/components/status/degraded.blade.php
@ -2,7 +2,12 @@
    'status' => 'Degraded',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center gap-2" wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
    <div class="badge badge-warning badge-xs"></div>
-    <div class="text-xs font-medium tracking-wide text-warning">{{ Str::headline($status) }}</div>
+    <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
+        {{ str($status)->before(':')->headline() }}
+    </div>
+    @if (!str($status)->startsWith('Proxy') && !str($status)->contains('('))
+        <div class="text-xs text-warning">({{ str($status)->after(':') }})</div>
+    @endif
 </div>
--- a/resources/views/components/status/restarting.blade.php
+++ b/resources/views/components/status/restarting.blade.php
@ -2,7 +2,7 @@
    'status' => 'Restarting',
 ])
 <x-loading wire:loading.delay.longer />
-<div class="flex items-center " wire:loading.remove.delay.longer>
+<div class="flex items-center" wire:loading.remove.delay.longer>
    <div class="badge badge-warning badge-xs"></div>
    <div class="pl-2 pr-1 text-xs font-bold tracking-widerr text-warning">
        {{ str($status)->before(':')->headline() }}
--- a/resources/views/livewire/project/new/select.blade.php
+++ b/resources/views/livewire/project/new/select.blade.php
@ -168,7 +168,7 @@
                <x-forms.button wire:click="loadServices('force')">Reload List</x-forms.button>
                <input
                    class="w-full text-white rounded input input-sm bg-coolgray-200 disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
-                    wire:model.live.debounce.200ms="search" placeholder="Search...">
+                    wire:model.live.debounce.200ms="search" autofocus placeholder="Search...">
            </div>
            <div class="grid justify-start grid-cols-1 gap-4 text-left xl:grid-cols-3">
                @if ($loadingServices)
--- a/templates/compose/appsmith.yaml
+++ b/templates/compose/appsmith.yaml
@ -7,11 +7,11 @@ services:
  appsmith:
    image: index.docker.io/appsmith/appsmith-ce:latest
    environment:
-      - SERVICE_FQDN
+      - SERVICE_FQDN_APPSMITH
      - APPSMITH_MAIL_ENABLED=false
      - APPSMITH_DISABLE_TELEMETRY=true
      - APPSMITH_DISABLE_INTERCOM=true
-      - APPSMITH_SENTRY_DSN=  
+      - APPSMITH_SENTRY_DSN=
      - APPSMITH_SMART_LOOK_ID=
    volumes:
      - stacks-data:/appsmith-stacks
--- a/templates/compose/firefly.yaml
+++ b/templates/compose/firefly.yaml
@ -0,0 +1,56 @@
+# documentation: https://firefly-iii.org
+# slogan: A personal finances manager that can help you save money.
+# tags: finance, money, personal, manager
+# logo: svgs/firefly.svg
+
+services:
+  firefly:
+    image: fireflyiii/core:latest
+    environment:
+      - SERVICE_FQDN_FIREFLY
+      - APP_KEY=$SERVICE_BASE64_APPKEY
+      - DB_HOST=mysql
+      - DB_PORT=3306
+      - DB_CONNECTION=mysql
+      - DB_DATABASE=${MYSQL_DATABASE:-firefly}
+      - DB_USERNAME=$SERVICE_USER_MYSQL
+      - DB_PASSWORD=$SERVICE_PASSWORD_MYSQL
+      - STATIC_CRON_TOKEN=$SERVICE_BASE64_CRONTOKEN
+    volumes:
+      - firefly-upload:/var/www/html/storage/upload
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:8080"]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    depends_on:
+      mysql:
+        condition: service_healthy
+  mysql:
+    image: mariadb:lts
+    environment:
+      - MYSQL_USER=${SERVICE_USER_MYSQL}
+      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
+      - MYSQL_DATABASE=${MYSQL_DATABASE:-firefly}
+      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQLROOT}
+    healthcheck:
+      test:
+        [
+          "CMD",
+          "mysqladmin",
+          "ping",
+          "-h",
+          "localhost",
+          "-uroot",
+          "-p${SERVICE_PASSWORD_MYSQLROOT}",
+        ]
+      interval: 5s
+      timeout: 20s
+      retries: 10
+    volumes:
+      - firefly-mysql-data:/var/lib/mysql
+  # cron:
+  #   image: alpine
+  #   command: sh -c "echo \"0 3 * * * wget -qO- http://app:8080/api/v1/cron/$STATIC_CRON_TOKEN\" | crontab - && crond -f -L /dev/stdout"
+  #   environment:
+  #   - STATIC_CRON_TOKEN=$SERVICE_PASSWORD_32_CRONTOKEN
--- a/templates/service-templates.json
+++ b/templates/service-templates.json
@ -2,7 +2,7 @@
    "appsmith": {
        "documentation": "https:\/\/appsmith.com",
        "slogan": "Appsmith is low-code application platform for building internal tools.",
-        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE4KICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gTk9ORQo=",
+        "compose": "c2VydmljZXM6CiAgYXBwc21pdGg6CiAgICBpbWFnZTogJ2luZGV4LmRvY2tlci5pby9hcHBzbWl0aC9hcHBzbWl0aC1jZTpsYXRlc3QnCiAgICBlbnZpcm9ubWVudDoKICAgICAgLSBTRVJWSUNFX0ZRRE5fQVBQU01JVEgKICAgICAgLSBBUFBTTUlUSF9NQUlMX0VOQUJMRUQ9ZmFsc2UKICAgICAgLSBBUFBTTUlUSF9ESVNBQkxFX1RFTEVNRVRSWT10cnVlCiAgICAgIC0gQVBQU01JVEhfRElTQUJMRV9JTlRFUkNPTT10cnVlCiAgICAgIC0gQVBQU01JVEhfU0VOVFJZX0RTTj0KICAgICAgLSBBUFBTTUlUSF9TTUFSVF9MT09LX0lEPQogICAgdm9sdW1lczoKICAgICAgLSAnc3RhY2tzLWRhdGE6L2FwcHNtaXRoLXN0YWNrcycKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gTk9ORQo=",
        "tags": [
            "lowcode",
            "nocode",
@ -192,6 +192,19 @@
        "logo": "svgs\/filebrowser.svg",
        "minversion": "0.0.0"
    },
+    "firefly": {
+        "documentation": "https:\/\/firefly-iii.org",
+        "slogan": "A personal finances manager that can help you save money.",
+        "compose": "c2VydmljZXM6CiAgZmlyZWZseToKICAgIGltYWdlOiAnZmlyZWZseWlpaS9jb3JlOmxhdGVzdCcKICAgIGVudmlyb25tZW50OgogICAgICAtIFNFUlZJQ0VfRlFETl9GSVJFRkxZCiAgICAgIC0gQVBQX0tFWT0kU0VSVklDRV9CQVNFNjRfQVBQS0VZCiAgICAgIC0gREJfSE9TVD1teXNxbAogICAgICAtIERCX1BPUlQ9MzMwNgogICAgICAtIERCX0NPTk5FQ1RJT049bXlzcWwKICAgICAgLSAnREJfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gREJfVVNFUk5BTUU9JFNFUlZJQ0VfVVNFUl9NWVNRTAogICAgICAtIERCX1BBU1NXT1JEPSRTRVJWSUNFX1BBU1NXT1JEX01ZU1FMCiAgICAgIC0gU1RBVElDX0NST05fVE9LRU49JFNFUlZJQ0VfQkFTRTY0X0NST05UT0tFTgogICAgdm9sdW1lczoKICAgICAgLSAnZmlyZWZseS11cGxvYWQ6L3Zhci93d3cvaHRtbC9zdG9yYWdlL3VwbG9hZCcKICAgIGhlYWx0aGNoZWNrOgogICAgICB0ZXN0OgogICAgICAgIC0gQ01ECiAgICAgICAgLSBjdXJsCiAgICAgICAgLSAnLWYnCiAgICAgICAgLSAnaHR0cDovL2xvY2FsaG9zdDo4MDgwJwogICAgICBpbnRlcnZhbDogNXMKICAgICAgdGltZW91dDogMjBzCiAgICAgIHJldHJpZXM6IDEwCiAgICBkZXBlbmRzX29uOgogICAgICBteXNxbDoKICAgICAgICBjb25kaXRpb246IHNlcnZpY2VfaGVhbHRoeQogIG15c3FsOgogICAgaW1hZ2U6ICdtYXJpYWRiOmx0cycKICAgIGVudmlyb25tZW50OgogICAgICAtICdNWVNRTF9VU0VSPSR7U0VSVklDRV9VU0VSX01ZU1FMfScKICAgICAgLSAnTVlTUUxfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMfScKICAgICAgLSAnTVlTUUxfREFUQUJBU0U9JHtNWVNRTF9EQVRBQkFTRTotZmlyZWZseX0nCiAgICAgIC0gJ01ZU1FMX1JPT1RfUEFTU1dPUkQ9JHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICBoZWFsdGhjaGVjazoKICAgICAgdGVzdDoKICAgICAgICAtIENNRAogICAgICAgIC0gbXlzcWxhZG1pbgogICAgICAgIC0gcGluZwogICAgICAgIC0gJy1oJwogICAgICAgIC0gbG9jYWxob3N0CiAgICAgICAgLSAnLXVyb290JwogICAgICAgIC0gJy1wJHtTRVJWSUNFX1BBU1NXT1JEX01ZU1FMUk9PVH0nCiAgICAgIGludGVydmFsOiA1cwogICAgICB0aW1lb3V0OiAyMHMKICAgICAgcmV0cmllczogMTAKICAgIHZvbHVtZXM6CiAgICAgIC0gJ2ZpcmVmbHktbXlzcWwtZGF0YTovdmFyL2xpYi9teXNxbCcK",
+        "tags": [
+            "finance",
+            "money",
+            "personal",
+            "manager"
+        ],
+        "logo": "svgs\/firefly.svg",
+        "minversion": "0.0.0"
+    },
    "formbricks": {
        "documentation": "https:\/\/formbricks.com",
        "slogan": "Open Source Experience Management",