clean up

2024-06-30 04:00:34 +12:00 · 2023-10-25 15:06:54 +03:00 · 2023-10-25 15:06:54 +03:00 · 4c6976488c
parent b775c53666
commit 4c6976488c
12 changed files with 846 additions and 854 deletions
--- a/app/config/variables.php
+++ b/app/config/variables.php
@ -335,6 +335,54 @@ return [
            ],
        ],
    ],
+    [
+        'category' => 'InfluxDB',
+        'description' => 'Deprecated since 1.4.8.',
+        'variables' => [
+            [
+                'name' => '_APP_INFLUXDB_HOST',
+                'description' => 'InfluxDB server host name address. Default value is: \'influxdb\'.',
+                'introduction' => '',
+                'default' => 'influxdb',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_INFLUXDB_PORT',
+                'description' => 'InfluxDB server TCP port. Default value is: \'8086\'.',
+                'introduction' => '',
+                'default' => '8086',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ],
+    ],
+    [
+        'category' => 'StatsD',
+        'description' => 'Deprecated since 1.4.8.',
+        'variables' => [
+            [
+                'name' => '_APP_STATSD_HOST',
+                'description' => 'StatsD server host name address. Default value is: \'telegraf\'.',
+                'introduction' => '',
+                'default' => 'telegraf',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+            [
+                'name' => '_APP_STATSD_PORT',
+                'description' => 'StatsD server TCP port. Default value is: \'8125\'.',
+                'introduction' => '',
+                'default' => '8125',
+                'required' => false,
+                'question' => '',
+                'filter' => ''
+            ],
+        ],
+    ],
    [
        'category' => 'SMTP',
        'description' => "Appwrite is using an SMTP server for emailing your projects users and server admins. The SMTP env vars are used to allow Appwrite server to connect to the SMTP container.\n\nIf running in production, it might be easier to use a 3rd party SMTP server as it might be a little more difficult to set up a production SMTP server that will not send all your emails into your user\'s SPAM folder.",
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -58,7 +58,6 @@ App::post('/v1/account')
    ->label('audits.event', 'user.create')
    ->label('audits.resource', 'user/{response.$id}')
    ->label('audits.userId', '{response.$id}')
-    ->label('usage.metric', 'users.{scope}.requests.create')
    ->label('sdk.auth', [])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'create')
@ -1642,7 +1641,6 @@ App::get('/v1/account')
    ->desc('Get account')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
-    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'get')
@ -1685,7 +1683,6 @@ App::get('/v1/account/sessions')
    ->desc('List sessions')
    ->groups(['api', 'account'])
    ->label('scope', 'account')
-    ->label('usage.metric', 'users.{scope}.requests.read')
    ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
    ->label('sdk.namespace', 'account')
    ->label('sdk.method', 'listSessions')
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -1835,8 +1835,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateEmailAttribute')
@ -1876,8 +1874,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateEnumAttribute')
@ -1919,8 +1915,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:k
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateIpAttribute')
@ -1960,8 +1954,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateUrlAttribute')
@ -2001,8 +1993,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateIntegerAttribute')
@ -2052,8 +2042,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateFloatAttribute')
@ -2103,8 +2091,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boole
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'collections.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateBooleanAttribute')
@ -2143,8 +2129,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'documents.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}', 'collectionId:{request.collectionId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateDatetimeAttribute')
@ -2183,8 +2167,6 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
    ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
    ->label('audits.event', 'attribute.update')
    ->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
-    ->label('usage.metric', 'documents.{scope}.requests.update')
-    ->label('usage.params', ['databaseId:{request.databaseId}', 'collectionId:{request.collectionId}'])
    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
    ->label('sdk.namespace', 'databases')
    ->label('sdk.method', 'updateRelationshipAttribute')
@ -3594,8 +3576,8 @@ App::get('/v1/databases/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
@ -3668,8 +3650,8 @@ App::get('/v1/databases/:databaseId/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
@ -3745,8 +3727,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -476,8 +476,8 @@ App::get('/v1/functions/:functionId/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
@ -554,8 +554,8 @@ App::get('/v1/functions/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
--- a/app/controllers/api/project.php
+++ b/app/controllers/api/project.php
@ -52,8 +52,8 @@ App::get('/v1/project/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -1495,8 +1495,8 @@ App::get('/v1/storage/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
@ -1570,8 +1570,8 @@ App::get('/v1/storage/:bucketId/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -1241,8 +1241,8 @@ App::get('/v1/users/usage')
                $limit = $days['limit'];
                $period = $days['period'];
                $results = $dbForProject->find('stats', [
-                    Query::equal('period', [$period]),
                    Query::equal('metric', [$metric]),
+                    Query::equal('period', [$period]),
                    Query::limit($limit),
                    Query::orderDesc('time'),
                ]);
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@ -71,7 +71,6 @@ services:
      - mariadb
      - redis
 #      - clamav
-      - influxdb
    environment:
      - _APP_ENV
      - _APP_WORKER_PER_CORE
@ -106,8 +105,6 @@ services:
      - _APP_SMTP_USERNAME
      - _APP_SMTP_PASSWORD
      - _APP_USAGE_STATS
-      - _APP_INFLUXDB_HOST
-      - _APP_INFLUXDB_PORT
      - _APP_STORAGE_LIMIT
      - _APP_STORAGE_PREVIEW_LIMIT
      - _APP_STORAGE_ANTIVIRUS
@ -144,8 +141,6 @@ services:
      - _APP_EXECUTOR_HOST
      - _APP_LOGGING_PROVIDER
      - _APP_LOGGING_CONFIG
-      - _APP_STATSD_HOST
-      - _APP_STATSD_PORT
      - _APP_MAINTENANCE_INTERVAL
      - _APP_MAINTENANCE_RETENTION_EXECUTION
      - _APP_MAINTENANCE_RETENTION_CACHE
@ -595,16 +590,15 @@ services:
      - _APP_MAINTENANCE_RETENTION_USAGE_HOURLY
      - _APP_MAINTENANCE_RETENTION_SCHEDULES

-  appwrite-usage:
+  appwrite-worker-usage:
    image: <?php echo $organization; ?>/<?php echo $image; ?>:<?php echo $version."\n"; ?>
    entrypoint: usage
-    container_name: appwrite-usage
+    container_name: appwrite-worker-usage
    <<: *x-logging
    restart: unless-stopped
    networks:
      - appwrite
    depends_on:
-      - influxdb
      - mariadb
    environment:
      - _APP_ENV
@ -615,9 +609,6 @@ services:
      - _APP_DB_SCHEMA
      - _APP_DB_USER
      - _APP_DB_PASS
-      - _APP_INFLUXDB_HOST
-      - _APP_INFLUXDB_PORT
-      - _APP_USAGE_AGGREGATION_INTERVAL
      - _APP_REDIS_HOST
      - _APP_REDIS_PORT
      - _APP_REDIS_USER
@ -751,27 +742,6 @@ services:
  #   volumes:
  #     - appwrite-uploads:/storage/uploads

-  influxdb:
-    image: appwrite/influxdb:1.5.0
-    container_name: appwrite-influxdb
-    <<: *x-logging
-    restart: unless-stopped
-    networks:
-      - appwrite
-    volumes:
-      - appwrite-influxdb:/var/lib/influxdb:rw
-
-  telegraf:
-    image: appwrite/telegraf:1.4.0
-    container_name: appwrite-telegraf
-    <<: *x-logging
-    restart: unless-stopped
-    networks:
-      - appwrite
-    environment:
-      - _APP_INFLUXDB_HOST
-      - _APP_INFLUXDB_PORT
-
 networks:
  gateway:
    name: gateway
@ -788,5 +758,4 @@ volumes:
  appwrite-certificates:
  appwrite-functions:
  appwrite-builds:
-  appwrite-influxdb:
  appwrite-config:
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -654,9 +654,6 @@ services:
    volumes:
      - ./app:/usr/src/code/app
      - ./src:/usr/src/code/src
-      - ./vendor/utopia-php/platform:/usr/src/code/vendor/utopia-php/platform
-      - ./vendor/utopia-php/framework:/usr/src/code/vendor/utopia-php/framework
-      - ./vendor/utopia-php/queue:/usr/src/code/vendor/utopia-php/queue
    depends_on:
      - redis
      - mariadb
--- a/src/Appwrite/Platform/Tasks/CalcTierStats.php
+++ b/src/Appwrite/Platform/Tasks/CalcTierStats.php
@ -171,8 +171,8 @@ class CalcTierStats extends Action
                            $period = $periods[$range]['period'];

                            $requestDocs = $dbForProject->find('stats', [
-                                Query::equal('period', [$period]),
                                Query::equal('metric', [$metric]),
+                                Query::equal('period', [$period]),
                                Query::limit($limit),
                                Query::orderDesc('time'),
                            ]);
--- a/src/Appwrite/Platform/Tasks/Hamster.php
+++ b/src/Appwrite/Platform/Tasks/Hamster.php
@ -237,8 +237,8 @@ class Hamster extends Action
                            $period = $periodValue['period'];

                            $requestDocs = $dbForProject->find('stats', [
-                                Query::equal('period', [$period]),
                                Query::equal('metric', [$metric]),
+                                Query::equal('period', [$period]),
                                Query::limit($limit),
                                Query::orderDesc('time'),
                            ]);
--- a/tests/e2e/General/UsageTest.php
+++ b/tests/e2e/General/UsageTest.php