#WN-118# Removed stats connection to use the same database as the rest of the system

Author: Jose Ganora

.env.bitbucket-pipelines

@@ -13,12 +13,6 @@ DB_DATABASE=redcross_local
 DB_USERNAME=preparecenter
 DB_PASSWORD=preparecenter
 
-STATS_DB_HOST=0.0.0.0
-STATS_DB_PORT=3307
-STATS_DB_DATABASE=redcross_logs
-STATS_DB_USERNAME=preparecenter
-STATS_DB_PASSWORD=preparecenter
-
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

.env.example

@@ -13,12 +13,6 @@ DB_DATABASE=preparecenter
 DB_USERNAME=preparecenter
 DB_PASSWORD=preparecenter
 
-STATS_DB_HOST=mysql_stats
-STATS_DB_PORT=3306
-STATS_DB_DATABASE=usage_logs
-STATS_DB_USERNAME=preparecenter
-STATS_DB_PASSWORD=preparecenter
-
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

app/Classes/Repositories/UsageLogRepository.php

@@ -86,7 +86,7 @@ public function getForEndpoint($endpoint, $fromDate = null, $toDate = null)
 
     public function listByEndpoint($fromDate = null, $toDate = null)
     {
-        $query = DB::connection('stats_mysql')->table('usage_logs')
+        $query = DB::table('usage_logs')
             ->select('endpoint', 'application_id', DB::raw('count(*) as hit_count'))
             ->groupBy('application_id', 'endpoint')
             ->orderBy('hit_count', 'desc');

config/database.php

@@ -63,26 +63,6 @@
             ]) : [],
         ],
 
-        // This connection is used for the stats database
-        'stats_mysql' => [
-            'driver' => 'mysql',
-            'url' => env('STATS_DATABASE_URL'),
-            'host' => env('STATS_DB_HOST', '127.0.0.1'),
-            'port' => env('STATS_DB_PORT', '3306'),
-            'database' => env('STATS_DB_DATABASE', 'forge'),
-            'username' => env('STATS_DB_USERNAME', 'forge'),
-            'password' => env('STATS_DB_PASSWORD', ''),
-            'unix_socket' => env('STATS_DB_SOCKET', ''),
-            'charset' => 'utf8mb4',
-            'collation' => 'utf8mb4_unicode_ci',
-            'prefix' => '',
-            'prefix_indexes' => true,
-            'strict' => true,
-            'engine' => null,
-            'options' => extension_loaded('pdo_mysql') ? array_filter([
-                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
-            ]) : [],
-        ],
 
         'pgsql' => [
             'driver' => 'pgsql',

database/migrations/2023_01_23_155432_create_usage_logs_table.php

@@ -13,7 +13,7 @@ class CreateUsageLogsTable extends Migration
      */
     public function up()
     {
-        Schema::connection('stats_mysql')->create('usage_logs', function (Blueprint $table) {
+        Schema::create('usage_logs', function (Blueprint $table) {
             $table->increments('id');
             $table->bigInteger('application_id');
             $table->string('method');

database/seeds/UsageLogTableSeeder.php

@@ -21,7 +21,7 @@ public function run()
         $file->setFlags(SplFileObject::SKIP_EMPTY | SplFileObject::READ_AHEAD | SplFileObject::DROP_NEW_LINE | SplFileObject::READ_CSV);
 
         foreach ($file as $row) {
-            DB::connection('stats_mysql')->table('usage_logs')->insert([
+            DB::table('usage_logs')->insert([
                 'id' => $row[0],
                 'method' => $row[1],
                 'application_id' => $row[2],

helm-chart/values.yaml

@@ -55,10 +55,6 @@ secrets:
       DB_DATABASE: DB_DATABASE
       DB_USERNAME: DB_USERNAME
       DB_PASSWORD: DB_PASSWORD
-      STATS_DB_HOST: STATS_DB_HOST
-      STATS_DB_DATABASE: STATS_DB_DATABASE
-      STATS_DB_USERNAME: STATS_DB_USERNAME
-      STATS_DB_PASSWORD: STATS_DB_PASSWORD
       APP_KEY: APP_KEY
 
 # Ingress (if using)