fix the renamed function under windows (#19240)
Costa Tsaousis committed
Dec 17, 2024 at 17:05 UTC
7b01224f17f390b72b4523d1a1af8b992eb1379d
1 file changed
+34
-33
src/daemon/win_system-info.c
+34
-33
@@ -1,6 +1,7 @@
1
// SPDX-License-Identifier: GPL-3.0-or-later
2
3
#include "win_system-info.h"
4
+#include "database/rrdhost-system-info.h"
5
6
#ifdef OS_WINDOWS
7
@@ -41,21 +42,21 @@ static void netdata_windows_cpu_from_system_info(struct rrdhost_system_info *sys
42
43
char cpuData[256];
44
(void)snprintf(cpuData, 255, "%d", sysInfo.dwNumberOfProcessors);
44
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_CPU_LOGICAL_CPU_COUNT", cpuData);
45
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_CPU_LOGICAL_CPU_COUNT", cpuData);
46
47
char *arch = netdata_windows_arch(sysInfo.wProcessorArchitecture);
47
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_ARCHITECTURE", arch);
48
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_ARCHITECTURE", arch);
49
49
- (void)rrdhost_set_system_info_variable(
50
+ (void)rrdhost_system_info_set_by_name(
51
systemInfo, "NETDATA_SYSTEM_VIRTUALIZATION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
52
52
- (void)rrdhost_set_system_info_variable(
53
+ (void)rrdhost_system_info_set_by_name(
54
systemInfo, "NETDATA_SYSTEM_VIRT_DETECTION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
55
55
- (void)rrdhost_set_system_info_variable(
56
+ (void)rrdhost_system_info_set_by_name(
57
systemInfo, "NETDATA_SYSTEM_CONTAINER", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
58
58
- (void)rrdhost_set_system_info_variable(
59
+ (void)rrdhost_system_info_set_by_name(
60
systemInfo, "NETDATA_SYSTEM_CONTAINER_DETECTION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
61
62
}
@@ -67,7 +68,7 @@ static void netdata_windows_cpu_vendor_model(struct rrdhost_system_info *systemI
68
{
69
char cpuData[256];
70
long ret = netdata_registry_get_string_from_open_key(cpuData, 255, lKey, key);
70
- (void)rrdhost_set_system_info_variable(systemInfo,
71
+ (void)rrdhost_system_info_set_by_name(systemInfo,
72
variable,
73
(ret == ERROR_SUCCESS) ? cpuData : NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN);
74
}
@@ -88,13 +89,13 @@ static void netdata_windows_cpu_from_registry(struct rrdhost_system_info *system
89
if (cpuFreq)
90
(void)snprintf(cpuData, 255, "%lu", (unsigned long)cpuFreq);
91
91
- (void)rrdhost_set_system_info_variable(systemInfo,
92
+ (void)rrdhost_system_info_set_by_name(systemInfo,
93
"NETDATA_SYSTEM_CPU_FREQ",
94
(!cpuFreq) ? NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN : cpuData);
95
96
netdata_windows_cpu_vendor_model(systemInfo, lKey, "NETDATA_SYSTEM_CPU_VENDOR", "VendorIdentifier");
97
netdata_windows_cpu_vendor_model(systemInfo, lKey, "NETDATA_SYSTEM_CPU_MODEL", "ProcessorNameString");
97
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_CPU_DETECTION", NETDATA_WIN_DETECTION_METHOD);
98
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_CPU_DETECTION", NETDATA_WIN_DETECTION_METHOD);
99
}
100
101
static void netdata_windows_get_cpu(struct rrdhost_system_info *systemInfo)
@@ -114,10 +115,10 @@ static void netdata_windows_get_mem(struct rrdhost_system_info *systemInfo)
115
else
116
(void)snprintf(memSize, 255, "%llu", size * 1024); // to bytes
117
117
- (void)rrdhost_set_system_info_variable(systemInfo,
118
+ (void)rrdhost_system_info_set_by_name(systemInfo,
119
"NETDATA_SYSTEM_TOTAL_RAM",
120
(!size) ? NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN : memSize);
120
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_RAM_DETECTION", NETDATA_WIN_DETECTION_METHOD);
121
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_RAM_DETECTION", NETDATA_WIN_DETECTION_METHOD);
122
}
123
124
static ULONGLONG netdata_windows_get_disk_size(char *cVolume)
@@ -160,8 +161,8 @@ static void netdata_windows_get_total_disk_size(struct rrdhost_system_info *syst
161
162
char diskSize[256];
163
(void)snprintf(diskSize, 255, "%llu", total);
163
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_TOTAL_DISK_SIZE", diskSize);
164
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_DISK_DETECTION", NETDATA_WIN_DETECTION_METHOD);
164
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_TOTAL_DISK_SIZE", diskSize);
165
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_DISK_DETECTION", NETDATA_WIN_DETECTION_METHOD);
166
}
167
168
// Host
@@ -245,63 +246,63 @@ static void netdata_windows_os_kernel_version(char *out, DWORD length, DWORD bui
246
static void netdata_windows_host(struct rrdhost_system_info *systemInfo)
247
{
248
char osVersion[4096];
248
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_HOST_OS_NAME", "Microsoft Windows");
249
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_HOST_OS_NAME", "Microsoft Windows");
250
251
DWORD build = netdata_windows_get_current_build();
252
253
netdata_windows_discover_os_version(osVersion, 4095, build);
253
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_HOST_OS_ID", osVersion);
254
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_HOST_OS_ID", osVersion);
255
255
- (void)rrdhost_set_system_info_variable(
256
+ (void)rrdhost_system_info_set_by_name(
257
systemInfo, "NETDATA_HOST_OS_ID_LIKE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN);
258
258
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_HOST_OS_VERSION", osVersion);
259
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_HOST_OS_VERSION_ID", osVersion);
259
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_HOST_OS_VERSION", osVersion);
260
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_HOST_OS_VERSION_ID", osVersion);
261
261
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_HOST_OS_DETECTION", NETDATA_WIN_DETECTION_METHOD);
262
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_HOST_OS_DETECTION", NETDATA_WIN_DETECTION_METHOD);
263
263
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_KERNEL_NAME", "Windows");
264
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_KERNEL_NAME", "Windows");
265
266
netdata_windows_os_kernel_version(osVersion, 4095, build);
266
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_SYSTEM_KERNEL_VERSION", osVersion);
267
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_SYSTEM_KERNEL_VERSION", osVersion);
268
268
- (void)rrdhost_set_system_info_variable(
269
+ (void)rrdhost_system_info_set_by_name(
270
systemInfo, "NETDATA_HOST_IS_K8S_NODE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_FALSE);
271
}
272
273
// Cloud
274
static void netdata_windows_cloud(struct rrdhost_system_info *systemInfo)
275
{
275
- (void)rrdhost_set_system_info_variable(
276
+ (void)rrdhost_system_info_set_by_name(
277
systemInfo, "NETDATA_INSTANCE_CLOUD_TYPE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN);
277
- (void)rrdhost_set_system_info_variable(
278
+ (void)rrdhost_system_info_set_by_name(
279
systemInfo, "NETDATA_INSTANCE_CLOUD_INSTANCE_TYPE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN);
279
- (void)rrdhost_set_system_info_variable(
280
+ (void)rrdhost_system_info_set_by_name(
281
systemInfo, "NETDATA_INSTANCE_CLOUD_INSTANCE_REGION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_UNKNOWN);
282
}
283
284
// Container
285
static void netdata_windows_container(struct rrdhost_system_info *systemInfo)
286
{
286
- (void)rrdhost_set_system_info_variable(
287
+ (void)rrdhost_system_info_set_by_name(
288
systemInfo, "NETDATA_CONTAINER_OS_NAME", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
288
- (void)rrdhost_set_system_info_variable(
289
+ (void)rrdhost_system_info_set_by_name(
290
systemInfo, "NETDATA_CONTAINER_OS_ID", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
290
- (void)rrdhost_set_system_info_variable(
291
+ (void)rrdhost_system_info_set_by_name(
292
systemInfo, "NETDATA_CONTAINER_OS_ID_LIKE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
292
- (void)rrdhost_set_system_info_variable(
293
+ (void)rrdhost_system_info_set_by_name(
294
systemInfo, "NETDATA_CONTAINER_OS_VERSION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
294
- (void)rrdhost_set_system_info_variable(
295
+ (void)rrdhost_system_info_set_by_name(
296
systemInfo, "NETDATA_CONTAINER_OS_VERSION_ID", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
296
- (void)rrdhost_set_system_info_variable(
297
+ (void)rrdhost_system_info_set_by_name(
298
systemInfo, "NETDATA_CONTAINER_OS_DETECTION", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_NONE);
298
- (void)rrdhost_set_system_info_variable(
299
+ (void)rrdhost_system_info_set_by_name(
300
systemInfo, "NETDATA_CONTAINER_IS_OFFICIAL_IMAGE", NETDATA_DEFAULT_SYSTEM_INFO_VALUE_FALSE);
301
}
302
303
static void netdata_windows_install_type(struct rrdhost_system_info *systemInfo)
304
{
304
- (void)rrdhost_set_system_info_variable(systemInfo, "NETDATA_INSTALL_TYPE", "netdata-installer.exe");
305
+ (void)rrdhost_system_info_set_by_name(systemInfo, "NETDATA_INSTALL_TYPE", "netdata-installer.exe");
306
}
307
308
void netdata_windows_get_system_info(struct rrdhost_system_info *systemInfo)