feat: Implement container logs functionality in InstancesViewModel
- Added properties for managing container logs, including log entries, service filters, and auto-refresh options. - Introduced commands for refreshing logs, toggling auto-refresh, and closing the logs panel. - Implemented log fetching logic with error handling and status messages. - Integrated log display in the InstancesView with a dedicated logs panel. feat: Enhance navigation to Instances page with auto-selection - Added method to navigate to the Instances page and auto-select an instance based on abbreviation. feat: Update SettingsViewModel to load and save Bitwarden configuration - Integrated Bitwarden configuration loading from IOptions and saving to appsettings.json. - Added properties for Bitwarden instance project ID and connection status. - Updated UI to reflect Bitwarden settings and connection status. feat: Add advanced options for instance creation - Introduced a new expander in CreateInstanceView for advanced options, including purging stale volumes. feat: Improve InstanceDetailsWindow with pending setup banner - Added a banner to indicate pending setup for Xibo OAuth credentials, with editable fields for client ID and secret. fix: Update appsettings.json to include Bitwarden configuration structure - Added Bitwarden section to appsettings.json for storing configuration values. chore: Update Docker Compose template with health checks - Added health check configuration for web service in template.yml to ensure service availability. refactor: Drop AppSettings table from database - Removed AppSettings table and related migration files as part of database cleanup. feat: Create ServiceLogEntry DTO for log management - Added ServiceLogEntry class to represent individual log entries from Docker services.
This commit is contained in:
Matt Batchelder
@@ -1,9 +1,11 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using Avalonia.Threading;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using OTSSignsOrchestrator.Core.Data;
|
||||
using OTSSignsOrchestrator.Core.Models.DTOs;
|
||||
using OTSSignsOrchestrator.Core.Models.Entities;
|
||||
using OTSSignsOrchestrator.Core.Services;
|
||||
using OTSSignsOrchestrator.Desktop.Models;
|
||||
@@ -30,15 +32,37 @@ public partial class InstancesViewModel : ObservableObject
|
||||
[ObservableProperty] private ObservableCollection<SshHost> _availableHosts = new();
|
||||
[ObservableProperty] private SshHost? _selectedSshHost;
|
||||
|
||||
// ── Container Logs ──────────────────────────────────────────────────────
|
||||
[ObservableProperty] private ObservableCollection<ServiceLogEntry> _logEntries = new();
|
||||
[ObservableProperty] private ObservableCollection<string> _logServiceFilter = new();
|
||||
[ObservableProperty] private string _selectedLogService = "All Services";
|
||||
[ObservableProperty] private bool _isLogsPanelVisible;
|
||||
[ObservableProperty] private bool _isLogsAutoRefresh = true;
|
||||
[ObservableProperty] private bool _isLoadingLogs;
|
||||
[ObservableProperty] private string _logsStatusMessage = string.Empty;
|
||||
[ObservableProperty] private int _logTailLines = 200;
|
||||
|
||||
private DispatcherTimer? _logRefreshTimer;
|
||||
private bool _isLogRefreshRunning;
|
||||
|
||||
/// <summary>Raised when the instance details modal should be opened for the given ViewModel.</summary>
|
||||
public event Action<InstanceDetailsViewModel>? OpenDetailsRequested;
|
||||
|
||||
private string? _pendingSelectAbbrev;
|
||||
|
||||
public InstancesViewModel(IServiceProvider services)
|
||||
{
|
||||
_services = services;
|
||||
_ = RefreshAllAsync();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Queues an abbreviation to be auto-selected once the next live refresh completes.
|
||||
/// Call immediately after construction (before <see cref="RefreshAllAsync"/> finishes).
|
||||
/// </summary>
|
||||
public void SetPendingSelection(string abbrev)
|
||||
=> _pendingSelectAbbrev = abbrev;
|
||||
|
||||
/// <summary>
|
||||
/// Enumerates all SSH hosts, then calls docker stack ls on each to build the
|
||||
/// live instance list. Only stacks matching *-cms-stack are shown.
|
||||
@@ -89,6 +113,15 @@ public partial class InstancesViewModel : ObservableObject
|
||||
i.HostLabel.Contains(FilterText, StringComparison.OrdinalIgnoreCase)).ToList();
|
||||
|
||||
Instances = new ObservableCollection<LiveStackItem>(all);
|
||||
|
||||
// Auto-select a pending instance (e.g. just deployed from Create Instance page)
|
||||
if (_pendingSelectAbbrev is not null)
|
||||
{
|
||||
SelectedInstance = all.FirstOrDefault(i =>
|
||||
i.CustomerAbbrev.Equals(_pendingSelectAbbrev, StringComparison.OrdinalIgnoreCase));
|
||||
_pendingSelectAbbrev = null;
|
||||
}
|
||||
|
||||
var msg = $"Found {all.Count} instance(s) across {hosts.Count} host(s).";
|
||||
if (errors.Count > 0) msg += $" | Errors: {string.Join(" | ", errors)}";
|
||||
StatusMessage = msg;
|
||||
@@ -110,11 +143,108 @@ public partial class InstancesViewModel : ObservableObject
|
||||
var services = await dockerCli.InspectStackServicesAsync(SelectedInstance.StackName);
|
||||
SelectedServices = new ObservableCollection<ServiceInfo>(services);
|
||||
StatusMessage = $"Found {services.Count} service(s) in stack '{SelectedInstance.StackName}'.";
|
||||
|
||||
// Populate service filter dropdown and show logs panel
|
||||
var filterItems = new List<string> { "All Services" };
|
||||
filterItems.AddRange(services.Select(s => s.Name));
|
||||
LogServiceFilter = new ObservableCollection<string>(filterItems);
|
||||
SelectedLogService = "All Services";
|
||||
IsLogsPanelVisible = true;
|
||||
|
||||
// Fetch initial logs and start auto-refresh
|
||||
await FetchLogsInternalAsync();
|
||||
StartLogAutoRefresh();
|
||||
}
|
||||
catch (Exception ex) { StatusMessage = $"Error inspecting: {ex.Message}"; }
|
||||
finally { IsBusy = false; }
|
||||
}
|
||||
|
||||
// ── Container Log Commands ──────────────────────────────────────────────
|
||||
|
||||
[RelayCommand]
|
||||
private async Task RefreshLogsAsync()
|
||||
{
|
||||
await FetchLogsInternalAsync();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private void ToggleLogsAutoRefresh()
|
||||
{
|
||||
IsLogsAutoRefresh = !IsLogsAutoRefresh;
|
||||
if (IsLogsAutoRefresh)
|
||||
StartLogAutoRefresh();
|
||||
else
|
||||
StopLogAutoRefresh();
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private void CloseLogsPanel()
|
||||
{
|
||||
StopLogAutoRefresh();
|
||||
IsLogsPanelVisible = false;
|
||||
LogEntries = new ObservableCollection<ServiceLogEntry>();
|
||||
LogsStatusMessage = string.Empty;
|
||||
}
|
||||
|
||||
partial void OnSelectedLogServiceChanged(string value)
|
||||
{
|
||||
// When user changes the service filter, refresh logs immediately
|
||||
if (IsLogsPanelVisible)
|
||||
_ = FetchLogsInternalAsync();
|
||||
}
|
||||
|
||||
private async Task FetchLogsInternalAsync()
|
||||
{
|
||||
if (SelectedInstance == null || _isLogRefreshRunning) return;
|
||||
|
||||
_isLogRefreshRunning = true;
|
||||
IsLoadingLogs = true;
|
||||
try
|
||||
{
|
||||
var dockerCli = _services.GetRequiredService<SshDockerCliService>();
|
||||
dockerCli.SetHost(SelectedInstance.Host);
|
||||
|
||||
string? serviceFilter = SelectedLogService == "All Services" ? null : SelectedLogService;
|
||||
var entries = await dockerCli.GetServiceLogsAsync(
|
||||
SelectedInstance.StackName, serviceFilter, LogTailLines);
|
||||
|
||||
LogEntries = new ObservableCollection<ServiceLogEntry>(entries);
|
||||
LogsStatusMessage = $"{entries.Count} log line(s) · last fetched {DateTime.Now:HH:mm:ss}";
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogsStatusMessage = $"Error fetching logs: {ex.Message}";
|
||||
}
|
||||
finally
|
||||
{
|
||||
IsLoadingLogs = false;
|
||||
_isLogRefreshRunning = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void StartLogAutoRefresh()
|
||||
{
|
||||
StopLogAutoRefresh();
|
||||
if (!IsLogsAutoRefresh) return;
|
||||
|
||||
_logRefreshTimer = new DispatcherTimer
|
||||
{
|
||||
Interval = TimeSpan.FromSeconds(5)
|
||||
};
|
||||
_logRefreshTimer.Tick += async (_, _) =>
|
||||
{
|
||||
if (IsLogsPanelVisible && IsLogsAutoRefresh && !_isLogRefreshRunning)
|
||||
await FetchLogsInternalAsync();
|
||||
};
|
||||
_logRefreshTimer.Start();
|
||||
}
|
||||
|
||||
private void StopLogAutoRefresh()
|
||||
{
|
||||
_logRefreshTimer?.Stop();
|
||||
_logRefreshTimer = null;
|
||||
}
|
||||
|
||||
[RelayCommand]
|
||||
private async Task DeleteInstanceAsync()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user