lizhuoran/data-collection-terminal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[增添]增添了后缀下拉菜单组件，修正了时间单位模版设置

Browse Source
This commit is contained in:
makotocc0107
2024-09-11 16:47:26 +08:00
committed by Coding
parent c2794f29ee
commit b63aff4b91
5 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker/prometheus/confd/templates/prometheus.tmpl
View File

@@ -1,13 +1,13 @@
global: global:
scrape_interval: {{ getv "/time/global_scrape_interval" }} scrape_interval: {{ getv '/time/global_scrape_interval' ~ getv '/time/global_scrape_interval_unit' }}
scrape_configs: scrape_configs:
- job_name: 'node_exporter' - job_name: 'node_exporter'
scrape_interval: {{ getv "/time/node_exporter_scrape_interval" }} scrape_interval: {{ getv "/time/node_exporter_scrape_interval" ~ getv "/time/node_exporter_scrape_interval_unit" }}
static_configs: static_configs:
- targets: [ 'node-exporter:9100' ] - targets: [ 'node-exporter:9100' ]
- job_name: 'opcua_exporter' - job_name: 'opcua_exporter'
scrape_interval: {{ getv "/time/opcua_scrape_interval" }} scrape_interval: {{ getv "/time/opcua_scrape_interval" ~ getv "/time/opcua_scrape_interval_unit" }}
static_configs: static_configs:
- targets: [ 'opcua-exporter:8191' ] - targets: [ 'opcua-exporter:8191' ]

2
docker/prometheus/confd/templates/supervisord.tmpl
View File

@@ -11,7 +11,7 @@ stderr_logfile=/var/log/confd.err.log
stdout_logfile=/var/log/confd.out.log stdout_logfile=/var/log/confd.out.log
[program:prometheus] [program:prometheus]
command=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time={{ getv "/time/storage_interval" }} command=/usr/local/bin/prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.retention.time={{ getv "/time/storage_interval" ~ getv "/time/storage_interval_unit" }}
autostart=true autostart=true
autorestart=true autorestart=true
stderr_logfile=/var/log/prometheus.err.log stderr_logfile=/var/log/prometheus.err.log

67
management-panel/app/Filament/Pages/ManageTime.php
View File

@@ -8,6 +8,7 @@ use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Pages\SettingsPage; use Filament\Pages\SettingsPage;
use Marvinosswald\FilamentInputSelectAffix\TextInputSelectAffix;
class ManageTime extends SettingsPage class ManageTime extends SettingsPage
{ {
@@ -23,22 +24,72 @@ class ManageTime extends SettingsPage
{ {
return $form return $form
->schema([ ->schema([
TextInput::make('global_scrape_interval') TextInputSelectAffix::make('global_scrape_interval')
->label('默认拉取时间') ->label('默认拉取时间')
->numeric()
->required() ->required()
->suffix("s"), ->select(fn() => Forms\Components\Select::make('global_scrape_interval_unit')
TextInput::make('node_exporter_scrape_interval') ->extraAttributes([
'class' => 'w-[72px]' // if you want to constrain the selects size, depending on your usecase
])
->options([
'd' => '天',
'h' => '小时',
'm' => '分钟',
's' => '秒'
])
->required()
),
TextInputSelectAffix::make('node_exporter_scrape_interval')
->label('系统监控时间间隔') ->label('系统监控时间间隔')
->required() ->required()
->suffix("s"), ->numeric()
TextInput::make('opcua_scrape_interval') ->select(fn() => Forms\Components\Select::make('node_exporter_scrape_interval_unit')
->extraAttributes([
'class' => 'w-[72px]' // if you want to constrain the selects size, depending on your usecase
])
->options([
'd' => '天',
'h' => '小时',
'm' => '分钟',
's' => '秒'
])
->required()
),
TextInputSelectAffix::make('opcua_scrape_interval')
->label('opcua_exporter抓取间隔') ->label('opcua_exporter抓取间隔')
->required() ->required()
->suffix("s"), ->numeric()
TextInput::make('storage_interval') ->select(fn() => Forms\Components\Select::make('opcua_scrape_interval_unit')
->extraAttributes([
'class' => 'w-[72px]' // if you want to constrain the selects size, depending on your usecase
])
->options([
'd' => '天',
'h' => '小时',
'm' => '分钟',
's' => '秒'
])
->required()
),
TextInputSelectAffix::make('storage_interval')
->label('数据存储时间') ->label('数据存储时间')
->required() ->required()
->suffix("h"), ->numeric()
->select(fn() => Forms\Components\Select::make('storage_interval_unit')
->extraAttributes([
'class' => 'w-[72px]' // if you want to constrain the selects size, depending on your usecase
])
->options([
'd' => '天',
'h' => '小时',
'm' => '分钟',
's' => '秒'
])
->required()
),
]); ]);
} }
} }

7
management-panel/app/Settings/TimeSettings.php
View File

@@ -15,6 +15,13 @@ class TimeSettings extends Settings
// 数据存储时间 // 数据存储时间
public ?string $storage_interval; public ?string $storage_interval;
public ?string $global_scrape_interval_unit;
public ?string $node_exporter_scrape_interval_unit;
public ?string $opcua_scrape_interval_unit;
public ?string $storage_interval_unit;
public static function group(): string public static function group(): string
{ {
return 'time'; return 'time';

13
management-panel/database/settings/2024_09_03_014745_time_settings.php
View File

@@ -7,9 +7,14 @@ return new class extends SettingsMigration
{ {
public function up(): void public function up(): void
{ {
$this->migrator->add('time.global_scrape_interval', ''); $this->migrator->add('time.global_scrape_interval', '15');
$this->migrator->add('time.node_exporter_scrape_interval', ''); $this->migrator->add('time.node_exporter_scrape_interval', '10');
$this->migrator->add('time.opcua_scrape_interval', ''); $this->migrator->add('time.opcua_scrape_interval', '10');
$this->migrator->add('time.storage_interval', ''); $this->migrator->add('time.storage_interval', '1');
$this->migrator->add('time.global_scrape_interval_unit', 's');
$this->migrator->add('time.node_exporter_scrape_interval_unit', 's');
$this->migrator->add('time.opcua_scrape_interval_unit', 's');
$this->migrator->add('time.storage_interval_unit', 'd');
} }
}; };