Skip to content
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.

Sign up for GitHub

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

[pull] master from netdata:master #186

Merged
merged 3 commits into from
Nov 19, 2024
Merged

[pull] master from netdata:master #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5647f9f
fix(go.d/nvidia_smi): disable loop mode on Win (#19040)
ilyam8 Nov 19, 2024
8c6eb51
Add Custom Actions (Installer) (#19041)
thiagoftsm Nov 19, 2024
be0d5a6
Add a special version number to bypass alert snapshots (#19042)
stelfrag Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions packaging/windows/netdata.wxs.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,16 @@
</File>
</ComponentGroup>

<CustomAction Id="DllPermission" 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="DllPermission" After="InstallFiles" />
</InstallExecuteSequence>

<CustomAction Id="InstallManifest" 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="InstallManifest" After="InstallFiles" />
</InstallExecuteSequence>

<Component Id="NetdataService" Directory="USRBINDIR">
<File Id="netdata.exe" Source="C:\msys64\opt\netdata\usr\bin\netdata.exe" KeyPath="yes" />

Expand Down
10 changes: 10 additions & 0 deletions src/database/sqlite/sqlite_aclk_alert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,6 +787,16 @@ static uint64_t calculate_node_alert_version(RRDHOST *host)

static void schedule_alert_snapshot_if_needed(struct aclk_sync_cfg_t *wc, uint64_t cloud_version)
{
if (cloud_version == 1) {
nd_log(
NDLS_ACCESS,
NDLP_NOTICE,
"Cloud requested to skip alert version verification for host \"%s\", node \"%s\"",
rrdhost_hostname(wc->host),
wc->node_id);
return;
}

uint64_t local_version = calculate_node_alert_version(wc->host);
if (local_version != cloud_version) {
nd_log(
Expand Down
3 changes: 3 additions & 0 deletions src/go/plugin/go.d/modules/nvidia_smi/nvidia_smi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ func (nv *NvidiaSmi) Configuration() any {

func (nv *NvidiaSmi) Init() error {
if nv.exec == nil {
if runtime.GOOS == "windows" && nv.LoopMode {
nv.LoopMode = false
}
smi, err := nv.initNvidiaSmiExec()
if err != nil {
return err
Expand Down
Loading