-
Notifications
You must be signed in to change notification settings - Fork 170
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[1.x] Ignore offline servers (continued) #355
Merged
Merged
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
e1d69d1
Add the option to ignore offline servers
leventdev 9b846e1
Fix: make default value false if the config option is not set.
leventdev 55e8ac6
Specify Ignore After time
leventdev b0cbf44
Fix inconsistent default values for ignore after
leventdev b529b07
Combine config options into one simple 'ignore_after'
JustinElst 9dde4e5
Get the $ignoreAfter config only once.
JustinElst c3db861
Configure ignore in seconds to match thresholds
jessarcher 29ee1e5
Add tests
jessarcher a219482
Add 'ignoreAfter' as a property on the Servers card
JustinElst c9e9c36
Fix getIgnoreAfterSeconds return
JustinElst 3e5b95a
Formatting
timacdonald File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,8 +3,10 @@ | |
namespace Laravel\Pulse\Livewire; | ||
|
||
use Carbon\CarbonImmutable; | ||
use Carbon\CarbonInterval; | ||
use Illuminate\Contracts\Support\Renderable; | ||
use Illuminate\Support\Facades\View; | ||
use Illuminate\Support\InteractsWithTime; | ||
use Livewire\Attributes\Lazy; | ||
use Livewire\Livewire; | ||
|
||
|
@@ -14,6 +16,10 @@ | |
#[Lazy] | ||
class Servers extends Card | ||
{ | ||
use InteractsWithTime; | ||
|
||
public int|string|null $ignoreAfter = null; | ||
|
||
/** | ||
* Render the component. | ||
*/ | ||
|
@@ -24,6 +30,10 @@ public function render(): Renderable | |
|
||
return $this->values('system') | ||
->map(function ($system, $slug) use ($graphs) { | ||
if ($this->ignoreSystem($system)) { | ||
return null; | ||
} | ||
|
||
$values = json_decode($system->value, flags: JSON_THROW_ON_ERROR); | ||
|
||
return (object) [ | ||
|
@@ -38,6 +48,7 @@ public function render(): Renderable | |
'recently_reported' => $updatedAt->isAfter(now()->subSeconds(30)), | ||
]; | ||
}) | ||
->filter() | ||
->sortBy('name'); | ||
}); | ||
|
||
|
@@ -59,4 +70,22 @@ public function placeholder(): Renderable | |
{ | ||
return View::make('pulse::components.servers-placeholder', ['cols' => $this->cols, 'rows' => $this->rows, 'class' => $this->class]); | ||
} | ||
|
||
/** | ||
* Determine if the system should be ignored. | ||
* | ||
* @param object{ timestamp: int, key: string, value: string } $system | ||
*/ | ||
protected function ignoreSystem(object $system): bool | ||
{ | ||
if ($this->ignoreAfter === null) { | ||
return false; | ||
} | ||
|
||
$ignoreAfter = is_numeric($this->ignoreAfter) | ||
? (int) $this->ignoreAfter | ||
: CarbonInterval::createFromDateString($this->ignoreAfter)->totalSeconds; | ||
|
||
return CarbonImmutable::createFromTimestamp($system->timestamp)->addSeconds($ignoreAfter)->isPast(); | ||
} | ||
Comment on lines
+74
to
+90
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've called this |
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Livewire does not support
DateInterval
as a prop value, so I've excluded it from the type here.Due to the way Livewire serializes values, we also cannot use
now()->addSeconds(60)
in the prop value.