archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-02 20:48:06 +00:00
Code Issues Projects Releases Wiki Activity

MSI Improvements ()

Browse source 
Co-authored-by: Ilya Mashchenko <ilya@netdata.cloud>
This commit is contained in:
thiagoftsm 2024-11-07 17:58:25 +00:00 • committed by GitHub
parent c210a9e730
commit b7924fd125
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 981 additions and 784 deletions

4
CMakeLists.txt
View file

@ -2502,6 +2502,10 @@ if(OS_WINDOWS)
configure_file(packaging/windows/netdata.wxs.in netdata.wxs @ONLY)
configure_file(packaging/windows/NetdataWhite.ico NetdataWhite.ico COPYONLY)
configure_file(packaging/windows/gpl-3.0.rtf gpl-3.0.rtf COPYONLY)
configure_file(packaging/windows/ncul1.rtf ncul1.rtf COPYONLY)
configure_file(packaging/windows/Top.bmp Top.bmp COPYONLY)
configure_file(packaging/windows/BackGround.bmp BackGround.bmp COPYONLY)
endif()
add_executable(netdata

BIN
packaging/windows/BackGround.bmp Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 707 KiB

BIN
packaging/windows/Top.bmp Normal file
View file

Binary file not shown.
Side by side

After

(image error) Size: 125 KiB

22
packaging/windows/get-convert-licenses.sh
View file

@ -16,18 +16,14 @@ function txt_to_rtf() {
echo '}' >> "$OUTPUT"
}
if [ ! -f "gpl-3.0.txt" ]; then
curl -o gpl-3.0.txt "https://www.gnu.org/licenses/gpl-3.0.txt"
fi
function check_and_get_file() {
if [ ! -f "$1" ]; then
curl -o "tmp.txt" "$2"
txt_to_rtf "tmp.txt" "$1"
rm "tmp.txt"
fi
}
if [ ! -f "cloud.txt" ]; then
curl -o cloud.txt "https://raw.githubusercontent.com/netdata/netdata/master/src/web/gui/v2/LICENSE.md"
fi
check_and_get_file "gpl-3.0.rtf" "https://www.gnu.org/licenses/gpl-3.0.txt"
check_and_get_file "ncul1.rtf" "https://app.netdata.cloud/LICENSE.txt"
if [ -f "gpl-3.0.txt" ] ; then
txt_to_rtf "gpl-3.0.txt" "gpl-3.0.rtf"
fi
if [ -f "cloud.txt" ] ; then
txt_to_rtf "cloud.txt" "cloud.rtf"
fi

1353
packaging/windows/gpl-3.0.txt → packaging/windows/gpl-3.0.rtf
View file

File diff suppressed because it is too large Load diff

47
packaging/windows/ncul1.rtf Normal file
View file

@ -0,0 +1,47 @@
{\rtf1\ansi\deff0 {\fonttbl {\f0 Times New Roman;}}
\paperh15840 \paperw12240
\margl720 \margr720 \margt720 \margb720
\f0\fs24
# Netdata Cloud UI License v1.0 (NCUL1)\line
\line
## Acceptance\line
By using the software, you agree to all of the terms and conditions below.\line
\line
## Copyright License\line
The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available the software, in each case subject to the limitations, restrictions and conditions below.\line
\line
## Limitations\line
This license allows you to use the Software only to interface with the licensor's other software components, such as Netdata Agents and Netdata Cloud. Any use with replacements for these components is not permitted.\line
\line
## Restrictions\line
The Software is provided in a binary form for use by end-users. You may not reverse engineer, decompile, disassemble, or modify the Software. The Software is licensed as a single product and its component parts may not be separated.\line
\line
## Patents\line
If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your license for the software granted under these terms ends immediately. If your company makes such a claim, your license ends immediately for work on behalf of your company.\line
\line
## Notices\line
You must ensure that anyone who gets a copy of the Software from you also gets a copy of these terms.\line
\line
## No Other Rights\line
These terms do not imply any licenses other than those expressly granted in these terms.\line
\line
## Termination\line
If you use the Software in violation of any of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violations of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.\line
\line
## No Warranties and No Liability\line
The software comes "As Is", without any express or implied warranties of any kind, including but not limited to any warranties of merchantability, non-infringement, or fitness for a particular purpose. The licensor will not be liable to you for any damages arising out of these terms or the use or nature of the Software, under any kind of legal claim.\line
\line
## Open Source Components\line
The software includes certain third party open source components. Each of these components is subject to its own license. The list of open-source components used by Netdata Cloud UI is [here](https://app.netdata.cloud/3D_PARTY_LICENSES.txt).\line
\line
## Definitions\line
The "licensor" is Netdata Inc., the entity offering these terms, and the "**software**" is the Netdata Cloud UI software the licensor makes available under these terms, including any portion of it.\line
\line
"**you**" refers to the individual or entity agreeing to these terms.\line
\line
"**your company**" is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. "**Control**" means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.\line
\line
"**your licenses**" are all the licenses granted to you for the software under these terms.\line
\line
"**use**" means anything you do with the software requiring one of your licenses.\line
}

328
packaging/windows/netdata.wxs.in
View file

@ -1,115 +1,257 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix
xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<!-- xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui" -->
<Package Name="Netdata Agent"
Manufacturer="Netdata Inc."
Version="@CMAKE_PROJECT_VERSION@"
UpgradeCode="0d949b90-a54d-4aae-9616-e15fbc410530">
<Package Name="Netdata Agent"
Manufacturer="Netdata Inc."
Version="@CMAKE_PROJECT_VERSION@"
UpgradeCode="0d949b90-a54d-4aae-9616-e15fbc410530">
<UIRef Id="WixUI_ErrorProgressText" />
<Media Id="1" Cabinet="netdata" EmbedCab="yes" />
<MediaTemplate EmbedCab="yes"/>
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
<Icon Id="NetdataIcon.ico" SourceFile="NetdataWhite.ico"/>
<Property Id="ARPPRODUCTICON" Value="NetdataIcon.ico" />
<WixVariable Id="WixUILicenseRtf" Value="cloud.rtf" />
<Property Id="TOKEN" Secure="yes" />
<Property Id="ROOMS" Secure="yes" />
<Property Id="INSECURE" Secure="yes" />
<Property Id="PROXY" Secure="yes" />
<Property Id="URL" Value="https://app.netdata.cloud" />
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
<Icon Id="NetdataIcon.ico" SourceFile="NetdataWhite.ico"/>
<Property Id="ARPPRODUCTICON" Value="NetdataIcon.ico" />
<Property Id="GPLLICENSE" Value="0" />
<Property Id="CLOUDUILICENSE" Value="0" />
<Property Id="TOKEN" Value=" " />
<Property Id="ROOMS" Value=" " />
<Property Id="INSECURE" Value="0" />
<Property Id="PROXY" Value=" " />
<Property Id="URL" Value="https://app.netdata.cloud" />
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
<Feature Id="Main">
<ComponentGroupRef Id="NetdataComponents" />
<ComponentRef Id="NetdataVarCache" />
<ComponentRef Id="NetdataVarLib" />
<ComponentGroupRef Id="WevtComponents" />
<ComponentRef Id="NetdataService" />
</Feature>
</Package>
<Feature Id="Main">
<ComponentGroupRef Id="NetdataComponents" />
<ComponentRef Id="NetdataVarCache" />
<ComponentRef Id="NetdataVarLib" />
<ComponentGroupRef Id="WevtComponents" />
<ComponentRef Id="NetdataService" />
</Feature>
<Fragment>
<Property Id="MsiLogging" Value="voicewarmupx!"/>
<WixVariable Id="WixUIBannerBmp" Value="Top.bmp" />
<WixVariable Id="WixUIDialogBmp" Value="BackGround.bmp" />
<UIRef Id="WixUI_ErrorProgressText" />
<ui:WixUI Id="FeatureTree_ViewLicense" />
</Package>
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLFOLDER" Name="Netdata">
<Directory Id="USRDIR" Name="usr">
<Directory Id="USRBINDIR" Name="bin" />
</Directory>
<Directory Id="VARDIR" Name="var">
<Directory Id="VARCACHEDIR" Name="cache" />
<Directory Id="VARLIBDIR" Name="lib" />
</Directory>
</Directory>
</StandardDirectory>
<Fragment>
<StandardDirectory Id="ProgramFiles64Folder">
<Directory Id="INSTALLFOLDER" Name="Netdata">
<Directory Id="USRDIR" Name="usr">
<Directory Id="USRBINDIR" Name="bin" />
</Directory>
<Directory Id="VARDIR" Name="var">
<Directory Id="VARCACHEDIR" Name="cache" />
<Directory Id="VARLIBDIR" Name="lib" />
</Directory>
<Directory Id="ETCDIR" Name="etc">
<Directory Id="ETCDIRNETDATA" Name="netdata" />
</Directory>
</Directory>
</StandardDirectory>
<StandardDirectory Id="System64Folder">
</StandardDirectory>
<Property Id="ETCNETDATACLAIMFILE">
<DirectorySearch Id="NetCoreDirectoryFoundx64" Path="[ETCDIRNETDATA]" >
<FileSearch Id="NetdataClaim" Name="claim.conf"/>
</DirectorySearch>
</Property>
<!-- All the files except for the ones we need to handle specially -->
<ComponentGroup Id="NetdataComponents" Directory="INSTALLFOLDER">
<Files Include="C:\msys64\opt\netdata\**">
<Exclude Files="C:\msys64\opt\netdata\usr\bin\netdata.exe" />
<Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml" />
<Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll" />
</Files>
</ComponentGroup>
<StandardDirectory Id="System64Folder">
</StandardDirectory>
<Component Id="NetdataVarCache" Directory="VARCACHEDIR" Guid="a41bc888-60d4-4d99-bb4f-da92614a8f72">
<CreateFolder />
</Component>
<!-- All the files except for the ones we need to handle specially -->
<ComponentGroup Id="NetdataComponents" Directory="INSTALLFOLDER">
<Files Include="C:\msys64\opt\netdata\**">
<Exclude Files="C:\msys64\opt\netdata\usr\bin\netdata.exe" />
<Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml" />
<Exclude Files="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll" />
</Files>
</ComponentGroup>
<Component Id="NetdataVarLib" Directory="VARLIBDIR" Guid="c72d7ea8-c848-46c4-a983-589044f2eec9">
<CreateFolder />
</Component>
<Component Id="NetdataVarCache" Directory="VARCACHEDIR" Guid="a41bc888-60d4-4d99-bb4f-da92614a8f72">
<CreateFolder />
</Component>
<!-- Install wevt manifest/dll files -->
<ComponentGroup Id="WevtComponents" Directory="System64Folder">
<File Id="WevtDll" Name="wevt_netdata.dll" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll">
</File>
<Component Id="NetdataVarLib" Directory="VARLIBDIR" Guid="c72d7ea8-c848-46c4-a983-589044f2eec9">
<CreateFolder />
</Component>
<File Id="WevtManifest" Name="wevt_netdata_manifest.xml" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml">
</File>
</ComponentGroup>
<CustomAction Id="ClaimAgent" Directory="USRBINDIR" ExeCommand='[USRBINDIR]NetdataClaim.exe /T &quot;[TOKEN]&quot; /R &quot;[ROOMS]&quot; /U &quot;[URL]&quot; /I [INSECURE] /P &quot;[PROXY]&quot; /F &quot;[INSTALLFOLDER]etc\netdata\claim.conf&quot;' Execute="deferred" Return="ignore" Impersonate="no"/>
<InstallExecuteSequence>
<Custom Action="ClaimAgent" After="InstallFiles" />
</InstallExecuteSequence>
<CustomAction Id="ClaimAgent" Directory="USRBINDIR" ExeCommand='[USRBINDIR]NetdataClaim.exe /T &quot;[TOKEN]&quot; /R &quot;[ROOMS]&quot; /U &quot;[URL]&quot; /I [INSECURE] /P &quot;[PROXY]&quot; /F &quot;[INSTALLFOLDER]etc\netdata\claim.conf&quot;' Execute="deferred" Return="ignore" Impersonate="no"/>
<InstallExecuteSequence>
<Custom Action="ClaimAgent" Before="InstallFinalize" />
</InstallExecuteSequence>
<!-- Install wevt manifest/dll files -->
<ComponentGroup Id="WevtComponents" Directory="System64Folder">
<File Id="WevtDll" Name="wevt_netdata.dll" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata.dll">
</File>
<CustomAction Id="WevtNetdataDLL" Directory="System64Folder" ExeCommand='[System64Folder]icacls.exe &quot;[System64Folder]wevt_netdata.dll&quot; /GRANT &quot;NT SERVICE\EventLog&quot;:R' Execute="deferred" Return="ignore" Impersonate="no"/>
<InstallExecuteSequence>
<Custom Action="WevtNetdataDLL" Before="InstallFinalize" />
</InstallExecuteSequence>
<File Id="WevtManifest" Name="wevt_netdata_manifest.xml" Source="C:\msys64\opt\netdata\usr\bin\wevt_netdata_manifest.xml">
</File>
</ComponentGroup>
<CustomAction Id="WevtUtil" Directory="System64Folder" ExeCommand='[System64Folder]wevtutil.exe im &quot;[System64Folder]wevt_netdata_manifest.xml&quot; &quot;/mf:[System64Folder]wevt_netdata.dll&quot; &quot;/rf:[System64Folder]wevt_netdata.dll&quot;' Execute="deferred" Return="ignore" Impersonate="no"/>
<InstallExecuteSequence>
<Custom Action="WevtUtil" Before="InstallFinalize" />
</InstallExecuteSequence>
<Component Id="NetdataService" Directory="USRBINDIR">
<File Id="netdata.exe" Source="C:\msys64\opt\netdata\usr\bin\netdata.exe" KeyPath="yes" />
<Component Id="NetdataService" Directory="USRBINDIR">
<File Id="netdata.exe" Source="C:\msys64\opt\netdata\usr\bin\netdata.exe" KeyPath="yes" />
<ServiceInstall Id="InstallService"
Name="Netdata"
DisplayName="Netdata Agent"
Description="Distributed, real-time, performance and health monitoring for systems and applications."
Type="ownProcess"
Start="auto"
ErrorControl="normal" />
<ServiceInstall Id="InstallService"
Name="Netdata"
DisplayName="Netdata Agent"
Description="Netdata is distributed, real-time, performance and health monitoring for systems and applications."
Type="ownProcess"
Start="auto"
ErrorControl="normal" />
<ServiceControl Id="ControlService"
Start="install"
Stop="both"
Remove="uninstall"
Name="Netdata"
Wait="yes" />
</Component>
</Fragment>
<ServiceControl Id="ControlService"
Start="install"
Stop="both"
Remove="uninstall"
Name="Netdata"
Wait="yes" />
</Component>
</Fragment>
<Fragment>
<UI Id="FeatureTree_ViewLicense_X64">
<Publish Dialog="ViewLicenseDlg1" Control="Print" Event="DoAction" Value="WixUIPrintEula_X64" />
<Publish Dialog="ViewLicenseDlg2" Control="Print" Event="DoAction" Value="WixUIPrintEula_X64" />
</UI>
<UIRef Id="FeatureTree_ViewLicense" />
</Fragment>
<Fragment>
<UI Id="file FeatureTree_ViewLicense">
<TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" />
<TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" />
<TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" />
<Property Id="DefaultUIFont" Value="WixUI_Font_Normal" />
<DialogRef Id="ErrorDlg" />
<DialogRef Id="FatalError" />
<DialogRef Id="FilesInUse" />
<DialogRef Id="MsiRMFilesInUse" />
<DialogRef Id="PrepareDlg" />
<DialogRef Id="ProgressDlg" />
<DialogRef Id="ResumeDlg" />
<DialogRef Id="UserExit" />
<Publish Dialog="ExitDialog" Control="Finish" Event="EndDialog" Value="Return" Order="999" />
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="ViewLicenseDlg1" Condition="NOT Installed" />
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Condition="Installed AND PATCH" />
<Publish Dialog="ViewLicenseDlg1" Control="Back" Event="NewDialog" Value="WelcomeDlg" />
<Publish Dialog="ViewLicenseDlg1" Control="Next" Event="NewDialog" Value="ViewLicenseDlg2" />
<Publish Dialog="ViewLicenseDlg2" Control="Back" Event="NewDialog" Value="ViewLicenseDlg1" />
<Publish Dialog="ViewLicenseDlg2" Control="Next" Event="NewDialog" Value="NDConfigDialog" Condition="NOT ETCNETDATACLAIMFILE" />
<Publish Dialog="ViewLicenseDlg2" Control="Next" Event="NewDialog" Value="NDConfigDialog" Condition="ETCNETDATACLAIMFILE" />
<Publish Dialog="NDConfigDialog" Control="Back" Event="NewDialog" Value="ViewLicenseDlg2" />
<Publish Dialog="NDConfigDialog" Control="Next" Event="NewDialog" Value="InstallDirDlg" />
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="NDConfigDialog" />
<Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="20" />
<Publish Dialog="InstallDirDlg" Control="Next" Event="SetTargetPath" Value="[WIXUI_INSTALLDIR]" Order="10" />
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Property="_BrowseProperty" Value="[WIXUI_INSTALLDIR]" Order="10" />
<Publish Dialog="InstallDirDlg" Control="ChangeFolder" Event="SpawnDialog" Value="BrowseDlg" Order="20" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="InstallDirDlg" Order="1" Condition="NOT Installed OR WixUI_InstallMode = &quot;Change&quot;" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="MaintenanceTypeDlg" Order="2" Condition="Installed AND NOT PATCH" />
<Publish Dialog="VerifyReadyDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="3" Condition="Installed AND PATCH" />
<Publish Dialog="MaintenanceWelcomeDlg" Control="Next" Event="NewDialog" Value="MaintenanceTypeDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="ChangeButton" Event="NewDialog" Value="InstallDirDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="RepairButton" Event="NewDialog" Value="VerifyReadyDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="RemoveButton" Event="NewDialog" Value="VerifyReadyDlg" />
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
</UI>
<UIRef Id="WixUI_Common" />
</Fragment>
<Fragment>
<UI>
<Dialog Id="ViewLicenseDlg1" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="The Cloud UI License covers the Netdata User Interface." />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="I &amp;Accept">
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
<Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="158" Sunken="yes" TabSkip="no">
<Text SourceFile="ncul1.rtf" />
</Control>
</Dialog>
</UI>
</Fragment>
<Fragment>
<UI>
<Dialog Id="ViewLicenseDlg2" Width="370" Height="270" Title="!(loc.LicenseAgreementDlg_Title)">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.LicenseAgreementDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="The GPL-3.0 License covers the Agent source code." />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="I &amp;Accept">
<Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg" Condition="!(wix.WixUICostingPopupOptOut) OR CostingComplete = 1" />
</Control>
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
<Control Id="LicenseText" Type="ScrollableText" X="20" Y="60" Width="330" Height="158" Sunken="yes" TabSkip="no">
<Text SourceFile="gpl-3.0.rtf" />
</Control>
</Dialog>
</UI>
</Fragment>
<Fragment>
<UI>
<Dialog Id="NDConfigDialog" Width="370" Height="270" Title="Netdata Cloud">
<Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="!(loc.LicenseAgreementDlgBannerBitmap)" />
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="340" Height="15" Transparent="yes" NoPrefix="yes" Text="Enter your Space's Claim Token and the Room IDs where you want to add the Agent." />
<Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="Connect to the Cloud" />
<Control Id="WarningLabel" Type="Text" X="10" Y="60" Width="290" Height="15" Text="Agent already claimed? Click Next." />
<Control Id="TokenLabel" Type="Text" X="10" Y="90" Width="55" Height="15" Text="Claim Token:" />
<Control Id="Token" Type="Edit" X="65" Y="90" Width="290" Height="18" Property="TOKEN" />
<Control Id="RoomsLabel" Type="Text" X="10" Y="105" Width="55" Height="15" Text="Rooms ID(s):" />
<Control Id="Rooms" Type="Edit" X="65" Y="105" Width="290" Height="18" Property="ROOMS" />
<Control Id="ProxyLabel" Type="Text" X="10" Y="120" Width="55" Height="15" Text="Proxy URL:" />
<Control Id="Proxy" Type="Edit" X="65" Y="120" Width="290" Height="18" Property="PROXY" />
<Control Id="URLLabel" Type="Text" X="10" Y="135" Width="55" Height="15" Text="Cloud URL:" />
<Control Id="URL" Type="Edit" X="65" Y="135" Width="290" Height="18" Property="URL" />
<Control Id="InsecureCheckbox" Type="CheckBox" X="10" Y="150" Width="290" Height="15" Property="INSECURE" CheckBoxValue="0" Text="Insecure" />
<Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" />
<Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.WixUINext)" />
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
<Publish Event="SpawnDialog" Value="CancelDlg" />
</Control>
</Dialog>
</UI>
</Fragment>
</Wix>

2
packaging/windows/package-windows.sh
View file

@ -33,7 +33,7 @@ if [ ! -f "/gpl-3.0.txt" ]; then
fi
if [ ! -f "/cloud.txt" ]; then
curl -o /cloud.txt "https://raw.githubusercontent.com/netdata/netdata/master/src/web/gui/v2/LICENSE.md"
curl -o /cloud.txt "https://app.netdata.cloud/LICENSE.txt"
fi
${GITHUB_ACTIONS+echo "::endgroup::"}

9
src/claim/main.c
View file

@ -238,6 +238,11 @@ static int netdata_claim_get_path(char *path)
static void netdata_claim_write_config(char *path)
{
#define NETDATA_MIN_CLOUD_LENGTH 135
#define NETDATA_MIN_ROOM_LENGTH 36
if (strlen(aToken) != NETDATA_MIN_CLOUD_LENGTH || strlen(aRoom) < NETDATA_MIN_ROOM_LENGTH)
return;
char configPath[WINDOWS_MAX_PATH + 1];
char data[WINDOWS_MAX_PATH + 1];
char *filename;
@ -248,9 +253,7 @@ static void netdata_claim_write_config(char *path)
filename = path;
}
// MessageBoxA(NULL, configPath, "PATH", 0);
HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
HANDLE hf = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
if (hf == INVALID_HANDLE_VALUE)
netdata_claim_error_exit(L"CreateFileA");