Migrate to Laravel Zero

.editorconfig

@@ -12,4 +12,5 @@ trim_trailing_whitespace = true
 trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
+indent_style = space
 indent_size = 2

.env.example

@@ -1,13 +1,2 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
 MONITOR_ENDPOINT=
-
-LOG_CHANNEL=stack
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
+DB_DATABASE=database.sqlite

.gitattributes

@@ -1,5 +1,7 @@
 * text=auto
-*.css linguist-vendored
-*.scss linguist-vendored
-*.js linguist-vendored
+/.github export-ignore
+.styleci.yml export-ignore
+.scrutinizer.yml export-ignore
+BACKERS.md export-ignore
+CONTRIBUTING.md export-ignore
 CHANGELOG.md export-ignore

.github/workflows/build.yml

@@ -0,0 +1,115 @@
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  prepare:
+    name: Compile PHP with Micro
+    runs-on: ubuntu-18.04
+
+    steps:
+      - name: Install Dependencies
+        run: sudo apt-get -y install flex bison re2c libonig-dev libsqlite3-dev
+
+      - name: Checkout PHP
+        uses: actions/checkout@v3
+        with:
+          repository: php/php-src
+          ref: PHP-8.0.19
+          path: php-src
+
+      - name: Checkout PHPMicro
+        uses: actions/checkout@v3
+        with:
+          repository: dixyes/phpmicro
+          ref: master
+          path: php-src/sapi/micro
+
+      - name: Apply PHPMicro Patch
+        run: |
+          cd php-src
+          patch -p1 < sapi/micro/patches/cli_checks_80.patch
+
+      - name: Build
+        run: |
+          cd php-src
+          ./buildconf --force
+
+      - name: Cache micro.sfx
+        id: cache-micro-sfx
+        uses: actions/cache@v3
+        with:
+          path: php-src/sapi/micro/micro.sfx
+          key: ${{ runner.os }}-micro-sfx-libxmldom
+
+      - name: Configure
+        if: steps.cache-micro-sfx-libxmldom.outputs.cache-hit != 'true'
+        run: |
+          cd php-src
+          ./configure --disable-phpdbg --disable-cgi --disable-cli --disable-all --enable-micro --enable-phar --enable-pdo --enable-dom --with-libxml --with-zlib --with-iconv --enable-filter --with-pdo-sqlite --with-sqlite3
+
+      - name: Make Micro
+        if: steps.cache-micro-sfx-libxmldom.outputs.cache-hit != 'true'
+        run: |
+          cd php-src
+          make micro
+
+      - uses: actions/upload-artifact@v2
+        if: steps.cache-micro-sfx-libxmldom.outputs.cache-hit != 'true'
+        with:
+          name: micro
+          path: php-src/sapi/micro/micro.sfx
+
+  build-forge-monitor:
+    needs: prepare
+
+    name: Build Forge Monitor
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Extract the tag version
+        id: tag
+        run: echo ::set-output name=tag::${GITHUB_REF##*v}
+
+      - name: Checkout the code
+        uses: actions/checkout@v3
+
+      - name: Obtain Composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache Composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.0"
+          extensions: json, dom, curl, libxml, mbstring, zip
+          coverage: none
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Dependencies
+        run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+
+      - name: Build Forge Monitor
+        run: ./application app:build --build-version=${{ github.ref_name }}
+
+      - uses: actions/cache@v3
+        with:
+          path: php-src/sapi/micro/micro.sfx
+          key: ${{ runner.os }}-micro-sfx-libxmldom
+
+      - name: Compile Forge Monitor
+        run: cat php-src/sapi/micro/micro.sfx ./builds/application > monitor
+
+      - name: Upload the binary to release
+        uses: actions/upload-artifact@v3
+        with:
+          name: monitor
+          path: monitor

.github/workflows/coding-standards.yml

@@ -0,0 +1,7 @@
+name: fix code styling
+
+on: [push]
+
+jobs:
+  compile:
+    uses: laravel/.github/.github/workflows/coding-standards.yml@main

.gitignore

@@ -1,13 +1,9 @@
-/node_modules
-/public/hot
-/public/storage
-/storage/*.key
 /vendor
-.env
-.env.backup
+/.idea
+/.vscode
+/.vagrant
 .phpunit.result.cache
-Homestead.json
-Homestead.yaml
-npm-debug.log
-yarn-error.log
-.monitor
+/builds
+/database/database.sqlite
+micro.sfx
+.env

README.md

@@ -1,13 +1,29 @@
 # Forge Monitor
 
-Laravel Forge monitoring built with Laravel.
+Laravel Forge monitoring built with [Laravel Zero](https://laravel-zero.com).
+
+## Building & Compiling
+
+The monitoring agent is built using Laravel Zero, a CLI framework for console applications. We then take the generated PHAR archive and compile this with [phpmicro](https://github.com/easysoft/phpmicro).
+
+You can check the `build.yml` file to see the steps required to compile the application.
+
+## Installation
+
+The monitoring agent is expected to be installed to `/root/forge-monitor`. You'll also need to `chmod +x monitor` so that it can be executed.
+
+You'll then need to create a `.env` file in the same directory:
+
+```env
+DB_DATABASE=/root/forge-monitor/database.sqlite
+```
 
 ## Running
 
 You can run Forge Monitor with:
 
 ```bash
-php artisan stat:mem
+./monitor stat:mem
 ```
 
 The available stat commands are:
@@ -31,7 +47,7 @@ For the `disk` monitors, this threshold will only need to be met once at any giv
 
 ## Data Storage
 
-Forge Monitor writes to a local SQLite database at `./database/database.db`, giving us a history of recent stat points.
+Forge Monitor writes to a local SQLite database, giving us a history of recent stat points.
 
 After a sample of the stat has been taken, we will check whether each configured monitor of the stat type has been met. This can be done with SQL queries executed against the DB.
 

app/Alert.php

@@ -17,8 +17,8 @@ class Alert extends Model
     /**
      * Create an alert for a monitor's state.
      *
-     * @param  \App\Monitors\Monitor $monitor
-     * @param  string $state
+     * @param  \App\Monitors\Monitor  $monitor
+     * @param  string  $state
      * @return $this
      */
     public static function createForMonitor(Monitor $monitor, $state)

app/Console/Commands/AbstractStatCommand.php → app/Commands/AbstractStatCommand.php

@@ -1,13 +1,20 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Commands;
 
 use App\Monitors\MonitorConfig;
 use Exception;
-use Illuminate\Console\Command;
+use LaravelZero\Framework\Commands\Command;
 
 abstract class AbstractStatCommand extends Command
 {
+    /**
+     * The monitor config instance.
+     *
+     * @var \App\Monitors\MonitorConfig
+     */
+    protected $monitorConfig;
+
     /**
      * The configured monitors for the stat.
      *
@@ -32,10 +39,11 @@ public function __construct(MonitorConfig $monitorConfig)
     {
         parent::__construct();
 
-        if (!$this->statType) {
+        if (! $this->statType) {
             throw new Exception('No statType defined.');
         }
 
+        $this->monitorConfig = $monitorConfig;
         $this->monitors = $monitorConfig->forType($this->statType);
     }
 }

app/Console/Commands/CleanupCommand.php → app/Commands/CleanupCommand.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Commands;
 
-use Illuminate\Console\Command;
+use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Support\Facades\DB;
+use LaravelZero\Framework\Commands\Command;
 
 class CleanupCommand extends Command
 {
@@ -12,7 +13,7 @@ class CleanupCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'app:clean-up';
+    protected $signature = 'stat:clean-up';
 
     /**
      * The console command description.
@@ -32,4 +33,19 @@ public function handle()
         DB::delete('DELETE FROM disk_usages WHERE created_at <= DATETIME("NOW", "-INTERVAL 1 WEEK")');
         DB::delete('DELETE FROM memory_usages WHERE created_at <= DATETIME("NOW", "-INTERVAL 1 WEEK")');
     }
+
+    /**
+     * Define the command's schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    public function schedule(Schedule $schedule)
+    {
+        if (config('app.env') === 'production') {
+            $schedule->exec('/root/forge-monitor/monitor stat:clean-up')->everyMinute();
+        } else {
+            $schedule->command(static::class)->everyMinute();
+        }
+    }
 }

app/Console/Commands/DiskStatCommand.php → app/Commands/DiskStatCommand.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Commands;
+
+use Illuminate\Console\Scheduling\Schedule;
 
 class DiskStatCommand extends AbstractStatCommand
 {
@@ -42,15 +44,19 @@ class DiskStatCommand extends AbstractStatCommand
     public function handle()
     {
         // Don't run when no monitors are configured.
-        if ($this->monitors->isEmpty()) {
-            $this->verboseInfo("No disk monitors configured...");
+//        if ($this->monitors->isEmpty()) {
+//            $this->verboseInfo('No disk monitors configured...');
+//
+//            return;
+//        }
 
-            return;
-        }
+        $this->verboseInfo(sprintf('Monitor Config: %s...', $this->monitorConfig->getConfigPath()));
+
+        return;
 
         $this->monitors->each(function ($monitor) {
             // Take the sample if we haven't done so already.
-            if (!$this->sampleTaken) {
+            if (! $this->sampleTaken) {
                 $this->sampleTaken = true;
 
                 return $monitor->stat()->sample();
@@ -61,4 +67,19 @@ public function handle()
             $monitor->stat()->test();
         });
     }
+
+    /**
+     * Define the command's schedule.
+     *
+     * @param  \Illuminate\Console\Scheduling\Schedule  $schedule
+     * @return void
+     */
+    public function schedule(Schedule $schedule)
+    {
+        if (config('app.env') === 'production') {
+            $schedule->exec('/root/forge-monitor/monitor stat:disk')->everyMinute();
+        } else {
+            $schedule->command(static::class)->everyMinute();
+        }
+    }
 }

app/Console/Commands/InteractsWithCli.php → app/Commands/InteractsWithCli.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace App\Console\Commands;
+namespace App\Commands;
 
 trait InteractsWithCli
 {
     /**
      * Write a string as information output if verbose enough.
      *
-     * @param  string $line
+     * @param  string  $line
      * @return void
      */
     protected function verboseInfo($line)