diff --git a/LICENSE b/LICENSE index 43b12a8..73420ba 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2016 CymaticLabs +Copyright (c) 2026 CymaticLabs Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index f728f56..c8a6c5e 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ and [Robomongo](https://robomongo.org/). Under the hood it's powered by [InfluxD which is a portable InfluxDB client library for .NET (plus some [Kapacitor](https://www.influxdata.com/time-series-platform/kapacitor/) support). InfluxDB Studio presently implements interfaces and workflows for most of the InfluxData.Net API. +**Current build:** version **0.3.0** — upgraded to target **.NET 10** (`net10.0-windows`). + The following are planned features that are not yet implemented in the current version: * _~~Retention Policy management~~ implemented, but not documented_ @@ -52,11 +54,31 @@ The following are planned features that are not yet implemented in the current v ## Installation -Binary releases can be found [here](https://github.com/CymaticLabs/InfluxDBStudio/releases). +Binary releases can be found [here](https://github.com/ndavat/InfluxDBStudio/releases). + +You can build locally by downloading the source or cloning the repository. To build, you will need the [.NET 10 SDK](https://dotnet.microsoft.com/download) and [Visual Studio 2022 or newer](https://visualstudio.microsoft.com/downloads/) with the "Desktop development with .NET" workload (the Windows Forms designer). This is a Windows-only application because it targets `net10.0-windows` with Windows Forms, so Windows is the required platform to build and run. + +### Build from source + +From a command prompt at the repository root: + +```powershell +dotnet build CymaticLabs.InfluxDB.sln -c Debug +``` + +Or open the solution file `CymaticLabs.InfluxDB.sln` in Visual Studio and press F5 to build and run. + +### Run + +After building, launch the compiled executable: + +``` +src\CymaticLabs.InfluxDB.Studio\bin\Debug\net10.0-windows\InfluxDBStudio.exe +``` -You can build locally by downloading the source or cloning the repository. Eventually some binary releases might be included with the repository going forward. To build, you will need [Visual Studio 2015](https://www.visualstudio.com/downloads/). Building with Mono might be possible with additional steps but it's not clear how usable it will be. The Mac OS X version definitely has some issues. For now, Windows is the recommended platform to use. +The app opens to the **Manage Connections** dialog, where you can create an InfluxDB server connection (host, port, database, credentials, and SSL options) and connect. -Open the solution file `CymaticLabs.InfluxDB.sln` to get started. +> **Note:** InfluxDB Studio is Windows-only. `App.config` is copied to `InfluxDBStudio.dll.config` next to the executable, so keep them together. Saved connections are stored in `user.config` under `%LocalAppData%`. ## Managing Connections diff --git a/src/CymaticLabs.InfluxDB.Studio/App.config b/src/CymaticLabs.InfluxDB.Studio/App.config index 9e39d94..2d00d99 100644 --- a/src/CymaticLabs.InfluxDB.Studio/App.config +++ b/src/CymaticLabs.InfluxDB.Studio/App.config @@ -1,26 +1,11 @@  - -
+ +
- - - - - - - - - - - - - - - diff --git a/src/CymaticLabs.InfluxDB.Studio/Controls/ContinuousQueryControl.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Controls/ContinuousQueryControl.Designer.cs index e1327b3..03f3bfd 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Controls/ContinuousQueryControl.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Controls/ContinuousQueryControl.Designer.cs @@ -171,7 +171,7 @@ private void InitializeComponent() // queryEditor // this.queryEditor.Dock = System.Windows.Forms.DockStyle.Fill; - this.queryEditor.Lexer = ScintillaNET.Lexer.Sql; + this.queryEditor.LexerName = "sql"; this.queryEditor.Location = new System.Drawing.Point(0, 0); this.queryEditor.Name = "queryEditor"; this.queryEditor.Size = new System.Drawing.Size(776, 271); diff --git a/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.Designer.cs index 24e5151..2225143 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Controls/QueryControl.Designer.cs @@ -62,7 +62,7 @@ private void InitializeComponent() // queryEditor // this.queryEditor.Dock = System.Windows.Forms.DockStyle.Fill; - this.queryEditor.Lexer = ScintillaNET.Lexer.Sql; + this.queryEditor.LexerName = "sql"; this.queryEditor.Location = new System.Drawing.Point(0, 0); this.queryEditor.Name = "queryEditor"; this.queryEditor.Size = new System.Drawing.Size(916, 128); diff --git a/src/CymaticLabs.InfluxDB.Studio/Controls/RunningQueriesControl.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Controls/RunningQueriesControl.Designer.cs index 87b9ead..3a64e8c 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Controls/RunningQueriesControl.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Controls/RunningQueriesControl.Designer.cs @@ -85,7 +85,7 @@ private void InitializeComponent() // queryEditor // this.queryEditor.Dock = System.Windows.Forms.DockStyle.Fill; - this.queryEditor.Lexer = ScintillaNET.Lexer.Sql; + this.queryEditor.LexerName = "sql"; this.queryEditor.Location = new System.Drawing.Point(0, 0); this.queryEditor.Name = "queryEditor"; this.queryEditor.ReadOnly = true; diff --git a/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj b/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj index c09949c..882924e 100644 --- a/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj +++ b/src/CymaticLabs.InfluxDB.Studio/CymaticLabs.InfluxDB.Studio.csproj @@ -1,603 +1,24 @@ - - - + - Debug - AnyCPU - {0578E050-27C9-4345-A6C9-EBAA887611D2} WinExe - Properties + net10.0-windows + true + $(NoWarn);WFO1000;NU1510 CymaticLabs.InfluxDB.Studio InfluxDBStudio - v4.6.1 - 512 - true - - - - 0.1.2.0 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - + Resources\AppIcon.ico + false + disable + disable AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + 7.0 + - - ..\..\packages\InfluxData.Net.8.0.1\lib\net461\InfluxData.Net.dll - True - - - ..\..\packages\InfluxData.Net.8.0.1\lib\net461\InfluxData.Net.Common.dll - True - - - ..\..\packages\InfluxData.Net.8.0.1\lib\net461\InfluxData.Net.InfluxDb.dll - True - - - ..\..\packages\InfluxData.Net.8.0.1\lib\net461\InfluxData.Net.Kapacitor.dll - True - - - ..\..\packages\log4net.2.0.5\lib\net45-full\log4net.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll - True - - - ..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll - True - - - ..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - True - - - ..\..\packages\jacobslusser.ScintillaNET.3.5.10\lib\net40\ScintillaNET.dll - True - - - - - - ..\..\packages\System.Net.Http.4.3.2\lib\net46\System.Net.Http.dll - True - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll - True - - - ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll - True - - - - ..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll - True - - - ..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll - True - - - ..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll - True - - - ..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll - True - - - - - - - - - - - - - Form - - - AppForm.cs - - - Component - - - ExtendedTabControl.cs - - - Component - - - UserControl - - - RetentionPolicyControl.cs - - - UserControl - - - RunningQueriesControl.cs - - - UserControl - - - StatsControl.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - AboutDialog.cs - - - Form - - - BackfillDialog.cs - - - Form - - - ConnectionDialog.cs - - - UserControl - - - ContinuousQueryControl.cs - - - Form - - - CreateContinuousQueryDialog.cs - - - Form - - - CreateDatabaseDialog.cs - - - UserControl - - - DiagnosticsControl.cs - - - Form - - - RetentionPolicyDialog.cs - - - Form - - - EditPrivilegeDialog.cs - - - Form - - - EditUserDialog.cs - - - UserControl - - - FieldKeysControl.cs - - - Form - - - CreateUserDialog.cs - - - Form - - - GrantPrivilegeDialog.cs - - - UserControl - - - InfluxDbUsersControl.cs - - - Form - - - ManageConnectionsDialog.cs - - - - - - UserControl - - - QueryControl.cs - - - UserControl - - - QueryResultsControl.cs - - - UserControl - - - RequestControl.cs - - - UserControl - - - MeasurementControl.cs - - - UserControl - - - SeriesControl.cs - - - UserControl - - - TagKeysControl.cs - - - UserControl - - - TagValuesControl.cs - - - Form - - - UserPasswordDialog.cs - - - AppForm.cs - - - ExtendedTabControl.cs - - - RetentionPolicyControl.cs - - - RunningQueriesControl.cs - - - SeriesControl.cs - - - StatsControl.cs - - - AboutDialog.cs - - - BackfillDialog.cs - - - ConnectionDialog.cs - - - ContinuousQueryControl.cs - - - CreateContinuousQueryDialog.cs - - - CreateDatabaseDialog.cs - - - DiagnosticsControl.cs - - - RetentionPolicyDialog.cs - - - CreateUserDialog.cs - - - EditPrivilegeDialog.cs - - - EditUserDialog.cs - - - GrantPrivilegeDialog.cs - - - InfluxDbUsersControl.cs - - - ManageConnectionsDialog.cs - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - QueryControl.cs - - - QueryResultsControl.cs - - - MeasurementControl.cs - - - TagValuesControl.cs - - - UserPasswordDialog.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs index 6a1216d..ab0031a 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Data/InfluxDataNetClient.cs @@ -37,8 +37,14 @@ public InfluxDataNetClient(InfluxDbConnection connection) : // Create the underlying concrete client var c = connection; - influx = new InfluxData.Net.InfluxDb.InfluxDbClient(c.HttpConnectionString, - c.Username, c.Password, InfluxDbVersion.Latest); + influx = new InfluxData.Net.InfluxDb.InfluxDbClient( + c.HttpConnectionString, + c.Username, + c.Password, + InfluxDbVersion.Latest, + InfluxData.Net.Common.Enums.QueryLocation.FormData, + SslIgnoreValidator.CreateHttpClient(), + false); } #endregion Constructors diff --git a/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs b/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs index 52635cd..c88e528 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Data/SslIgnoreValidator.cs @@ -1,59 +1,49 @@ -using System.Net; -using System.Net.Security; +using System; +using System.Net.Http; using System.Security.Cryptography.X509Certificates; namespace CymaticLabs.InfluxDB.Data { /// - /// Utility class used to ignore verifying SSL/TLS certificates. + /// Utility class used to configure SSL/TLS certificate validation for InfluxDB + /// connections when untrusted SSL is allowed by the user. /// + /// + /// On .NET the settings no longer + /// affect , so the certificate validation callback must be + /// supplied on the used by each client instead. + /// public static class SslIgnoreValidator { - // Whether or not the SSL validator override has been enabled or not - private static bool enabled = false; - // Whether or not to allow untrusted SSL/TLS certificates. private static bool allowUntrusted = false; /// - /// Gets whether or not to allow untrusted SSL/TLS certificates. + /// Gets or sets whether or not to allow untrusted SSL/TLS certificates. /// public static bool AllowUntrusted { get { return allowUntrusted; } - - set - { - allowUntrusted = value; - - // Configure untrusted allowances as needed - if (allowUntrusted && !enabled) - { - OverrideValidation(); - enabled = true; - } - } + set { allowUntrusted = value; } } - // Custom validation method - private static bool OnValidateCertificate(object sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors) + /// + /// Creates an whose handler bypasses certificate + /// validation errors when is enabled. + /// + /// An configured for the current setting. + public static HttpClient CreateHttpClient() { - if (sslPolicyErrors != SslPolicyErrors.None) + var handler = new HttpClientHandler(); + + if (allowUntrusted) { - if (!allowUntrusted && sslPolicyErrors == SslPolicyErrors.RemoteCertificateChainErrors) - { - return false; - } + handler.ServerCertificateCustomValidationCallback = + (HttpRequestMessage message, X509Certificate2 certificate, + X509Chain chain, System.Net.Security.SslPolicyErrors errors) => true; } - return true; - } - - // Overrides SSL/TLS certificate validation. - static void OverrideValidation() - { - ServicePointManager.ServerCertificateValidationCallback = OnValidateCertificate; - ServicePointManager.Expect100Continue = true; + return new HttpClient(handler); } } } diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs index b0c0754..34030c3 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.Designer.cs @@ -108,7 +108,7 @@ private void InitializeComponent() this.copyrightLabel.Name = "copyrightLabel"; this.copyrightLabel.Size = new System.Drawing.Size(250, 13); this.copyrightLabel.TabIndex = 3; - this.copyrightLabel.Text = "Copyright 2017 Michael Everett. All rights reserved."; + this.copyrightLabel.Text = "Copyright © 2026 CymaticLabs"; // // warranyLabel // diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs index a279f2b..00369ca 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/AboutDialog.cs @@ -37,13 +37,21 @@ private void AboutDialog_Load(object sender, EventArgs e) // Launch project link private void projectLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("https://github.com/CymaticLabs/InfluxDBStudio"); + System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo + { + FileName = "https://github.com/CymaticLabs/InfluxDBStudio", + UseShellExecute = true + }); } // Launch InfluxData.Net link private void influxDataNetLinkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - System.Diagnostics.Process.Start("https://github.com/pootzko/InfluxData.Net"); + System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo + { + FileName = "https://github.com/pootzko/InfluxData.Net", + UseShellExecute = true + }); } #endregion Event Handlers diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/BackFillDialog.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/BackFillDialog.Designer.cs index 18823b6..1cb7d71 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/BackFillDialog.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/BackFillDialog.Designer.cs @@ -78,7 +78,7 @@ private void InitializeComponent() this.queryEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.queryEditor.Lexer = ScintillaNET.Lexer.Sql; + this.queryEditor.LexerName = "sql"; this.queryEditor.Location = new System.Drawing.Point(12, 280); this.queryEditor.Name = "queryEditor"; this.queryEditor.Size = new System.Drawing.Size(595, 145); diff --git a/src/CymaticLabs.InfluxDB.Studio/Dialogs/CreateContinuousQueryDialog.Designer.cs b/src/CymaticLabs.InfluxDB.Studio/Dialogs/CreateContinuousQueryDialog.Designer.cs index 5fd1a5a..093fe4f 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Dialogs/CreateContinuousQueryDialog.Designer.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Dialogs/CreateContinuousQueryDialog.Designer.cs @@ -424,7 +424,7 @@ private void InitializeComponent() this.queryEditor.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.queryEditor.Lexer = ScintillaNET.Lexer.Sql; + this.queryEditor.LexerName = "sql"; this.queryEditor.Location = new System.Drawing.Point(12, 229); this.queryEditor.Name = "queryEditor"; this.queryEditor.Size = new System.Drawing.Size(595, 186); diff --git a/src/CymaticLabs.InfluxDB.Studio/Properties/AssemblyInfo.cs b/src/CymaticLabs.InfluxDB.Studio/Properties/AssemblyInfo.cs index 6368f00..02831b5 100644 --- a/src/CymaticLabs.InfluxDB.Studio/Properties/AssemblyInfo.cs +++ b/src/CymaticLabs.InfluxDB.Studio/Properties/AssemblyInfo.cs @@ -1,16 +1,18 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Runtime.Versioning; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. +[assembly: SupportedOSPlatform("Windows")] [assembly: AssemblyTitle("CymaticLabs.InfluxDB.Studio")] [assembly: AssemblyDescription("Visual IDE for managing InfluxDB")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("CymaticLabs.InfluxDB.Studio")] -[assembly: AssemblyCopyright("Copyright © Michael Everett/Cymatic Labs 2017")] +[assembly: AssemblyCopyright("Copyright © 2026 CymaticLabs)] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,8 +34,8 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.2.0.0")] -[assembly: AssemblyFileVersion("0.2.0.0")] +[assembly: AssemblyVersion("0.3.0.0")] +[assembly: AssemblyFileVersion("0.3.0.0")] // Enable log4net using app.config [assembly: log4net.Config.XmlConfigurator(Watch = true)] diff --git a/src/CymaticLabs.InfluxDB.Studio/packages.config b/src/CymaticLabs.InfluxDB.Studio/packages.config deleted file mode 100644 index 827f9ec..0000000 --- a/src/CymaticLabs.InfluxDB.Studio/packages.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file