From eabc40606d44a2f7e15d827eabe66c89f188499c Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 12:44:06 +0200 Subject: [PATCH 01/10] Added support for Laravel 5.4 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e3975d5..f4aa532 100644 --- a/composer.json +++ b/composer.json @@ -11,8 +11,8 @@ ], "require": { "php": ">=5.6", - "illuminate/log": "5.2.*|5.3.*", - "illuminate/support": "5.2.*|5.3.*", + "illuminate/log": "5.2.*|5.3.*|5.4.*", + "illuminate/support": "5.2.*|5.3.*|5.4.*", "influxdb/influxdb-php": "^1.4", "monolog/monolog": "^1.19" }, From c1215313ed2b25c9227aade136abc500622bf6a6 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 12:44:44 +0200 Subject: [PATCH 02/10] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ade7ccb..cf61c67 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ```js "require": { // ... - "pdffiller/laravel-influx-provider": "^1.2" + "pvgennip/laravel-influx-provider": "^1.3" } ``` - Add a line to `config/app.php` From 8e007df012b5aefc0b4af3f5cf3f76299b0ecb34 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 12:46:58 +0200 Subject: [PATCH 03/10] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f4aa532..5b5fde5 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "pdffiller/laravel-influx-provider", + "name": "pvgennip/laravel-influx-provider", "description": "Service provider to set up and use InfluxDB SDK in Laravel 5", "keywords": ["influx-db", "laravel"], "license": "MIT", From 7fb52287acf8b899a47731053220ef2b5a620063 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 13:13:09 +0200 Subject: [PATCH 04/10] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cf61c67..6dde34c 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,15 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ### Installation - Add a line to *require* section of `composer.json` and execute `$ composer install` ```js +"repositories": [ + { + "type": "vcs", + "url": "https://github.com/pvgennip/laravel-influx-provider" + } + ], "require": { // ... - "pvgennip/laravel-influx-provider": "^1.3" + "pvgennip/laravel-influx-provider": "dev-laravel-5.4" } ``` - Add a line to `config/app.php` From c0aaa8ed792fc5e23d3f882094ca806b04c13cf1 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 14:33:16 +0200 Subject: [PATCH 05/10] Added merge with config to add configuration to serviceprovider config() --- README.md | 11 ++++++++++- src/InfluxDBServiceProvider.php | 10 +++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cf61c67..d1cc85a 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,22 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 "pvgennip/laravel-influx-provider": "^1.3" } ``` -- Add a line to `config/app.php` +- Add these lines to `config/app.php` ```php 'providers' => [ // ... Pdffiller\LaravelInfluxProvider\InfluxDBServiceProvider::class, ] + + +'aliases' => [ +// ... + 'Influx' => Pdffiller\LaravelInfluxProvider\InfluxDBFacade::class, +] + ``` + + - Define env variables to connect to InfluxDB ``` LARAVEL_INFLUX_PROVIDER_PROTOCOL=http diff --git a/src/InfluxDBServiceProvider.php b/src/InfluxDBServiceProvider.php index c2365b6..8d483f9 100644 --- a/src/InfluxDBServiceProvider.php +++ b/src/InfluxDBServiceProvider.php @@ -14,8 +14,10 @@ class InfluxDBServiceProvider extends ServiceProvider public function boot() { $this->publishes([ - __DIR__ . '/config/InfluxDB.php' => config_path('influxdb.php') + $this->configPath() => config_path('influxdb.php') ]); + + $this->mergeConfigFrom($this->configPath(), 'influxdb'); if (config('influxdb.use_monolog_handler') === 'true') { $handler = new InfluxDBMonologHandler($this->getLoggingLevel()); @@ -32,6 +34,7 @@ public function boot() public function register() { $this->app->singleton('InfluxDB\Client', function($app) { + $protocol = 'influxdb'; if (in_array(config('influxdb.protocol'), ['https', 'udp'])) { $protocol = config('influxdb.protocol') . '+' . $protocol; @@ -67,4 +70,9 @@ private function getLoggingLevel() 'EMERGENCY' ]) ? config('influxdb.logging_level') : Logger::NOTICE; } + + protected function configPath() + { + return __DIR__ . '/config/InfluxDB.php'; + } } From c800e0b038bbe0560dbb682936066f1ef80b85b4 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 14:37:20 +0200 Subject: [PATCH 06/10] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d1cc85a..866473d 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,15 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ### Installation - Add a line to *require* section of `composer.json` and execute `$ composer install` ```js +"repositories": [ + { + "type": "vcs", + "url": "https://github.com/pvgennip/laravel-influx-provider" + } + ], "require": { // ... - "pvgennip/laravel-influx-provider": "^1.3" + "pvgennip/laravel-influx-provider": "dev-laravel-5.4" } ``` - Add these lines to `config/app.php` From fa5ec92efa116057d7a63bf1c3a9fb906123edcd Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Fri, 5 May 2017 14:45:06 +0200 Subject: [PATCH 07/10] Updated readme --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 866473d..2c28adb 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,9 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ### Installation - Add a line to *require* section of `composer.json` and execute `$ composer install` ```js -"repositories": [ - { - "type": "vcs", - "url": "https://github.com/pvgennip/laravel-influx-provider" - } - ], "require": { // ... - "pvgennip/laravel-influx-provider": "dev-laravel-5.4" + "pvgennip/laravel-influx-provider": "dev-master" } ``` - Add these lines to `config/app.php` @@ -42,6 +36,11 @@ LARAVEL_INFLUX_PROVIDER_DATABASE=database_name ``` ### How to use +```php +$client = new \Influx; +$data = $client::query('SELECT * from "data" ORDER BY time DESC LIMIT 1'); +``` + ```php $point = [ new \InfluxDB\Point( From be89f835a923576a082622f8a98dee23adfd84b4 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Mon, 12 Jun 2017 17:13:05 +0200 Subject: [PATCH 08/10] Create README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c28adb..3d548d4 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,14 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ### Installation -- Add a line to *require* section of `composer.json` and execute `$ composer install` +- Add these lines betofe AND to *require* section of `composer.json` and execute `$ composer install` ```js +"repositories": [ + { + "type": "vcs", + "url": "https://github.com/pvgennip/laravel-influx-provider" + } +], "require": { // ... "pvgennip/laravel-influx-provider": "dev-master" From 853643ec2efebb97564ce9418790dae9de1f4df8 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Tue, 13 Jun 2017 10:17:56 +0200 Subject: [PATCH 09/10] switched back to pdffiler repo --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5b5fde5..f4aa532 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "pvgennip/laravel-influx-provider", + "name": "pdffiller/laravel-influx-provider", "description": "Service provider to set up and use InfluxDB SDK in Laravel 5", "keywords": ["influx-db", "laravel"], "license": "MIT", From a579018378780cc1e79c3000ce1a36daf013e4b5 Mon Sep 17 00:00:00 2001 From: Pim van Gennip Date: Tue, 13 Jun 2017 10:22:55 +0200 Subject: [PATCH 10/10] Updated readme --- README.md | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3d548d4..b3edf0d 100644 --- a/README.md +++ b/README.md @@ -2,17 +2,11 @@ A minimal service provider to set up and use InfluxDB SDK in Laravel 5 ### Installation -- Add these lines betofe AND to *require* section of `composer.json` and execute `$ composer install` +- Add a line to the *require* section of `composer.json` and execute `$ composer install` ```js -"repositories": [ - { - "type": "vcs", - "url": "https://github.com/pvgennip/laravel-influx-provider" - } -], "require": { // ... - "pvgennip/laravel-influx-provider": "dev-master" + "pdffiller/laravel-influx-provider": "^1.2" } ``` - Add these lines to `config/app.php`