fix windows logs 2 - do not renumber - append fields (#19640)
do not renumber - append fields
Costa Tsaousis committed
Feb 13, 2025 at 14:25 UTC
bca67f21c4006d51094acb05cd60a47e1fdd3f21
3 files changed
+12
-16
src/libnetdata/log/nd_log-common.h
+4
-7
@@ -117,15 +117,12 @@ typedef enum __attribute__((__packed__)) {
117
NDF_ALERT_SUMMARY = 60,
118
NDF_ALERT_INFO = 61,
119
NDF_ALERT_NOTIFICATION_REALTIME_USEC = 62,
120
- // NDF_ALERT_FLAGS,
121
-
122
- NDF_STACK_TRACE = 63, // stack trace of the thread logging
120
+ NDF_REQUEST = 63, // the request we are currently working on
121
+ NDF_MESSAGE = 64, // the log message, if any
122
+ NDF_STACK_TRACE = 65, // stack trace of the thread logging
123
124
// put new items here
125
- // leave the request URL and the message last
126
-
127
- NDF_REQUEST = 64, // the request we are currently working on
128
- NDF_MESSAGE = 65, // the log message, if any
125
+ // NEVER RENUMBER FIELDS - RENUMBERING BREAKS EXISTING WINDOWS MESSAGES
126
127
// terminator
128
_NDF_MAX,
src/libnetdata/log/nd_log-internals.c
+7
-9
@@ -707,15 +707,6 @@ __thread struct log_field thread_log_fields[_NDF_MAX] = {
707
.logfmt = "alert_notification_timestamp",
708
.logfmt_annotator = timestamp_usec_annotator,
709
},
710
- [NDF_STACK_TRACE] = {
711
- .journal = "ND_STACK_TRACE",
712
- .eventlog = "StackTrace",
713
- .logfmt = NULL,
714
- },
715
-
716
- // put new items here
717
- // leave the request URL and the message last
718
-
710
[NDF_REQUEST] = {
711
.journal = "ND_REQUEST",
712
.eventlog = "Request",
@@ -726,6 +717,13 @@ __thread struct log_field thread_log_fields[_NDF_MAX] = {
717
.eventlog = "Message",
718
.logfmt = "msg",
719
},
720
+ [NDF_STACK_TRACE] = {
721
+ .journal = "ND_STACK_TRACE",
722
+ .eventlog = "StackTrace",
723
+ .logfmt = NULL,
724
+ },
725
+
726
+ // put new items here
727
};
728
729
// --------------------------------------------------------------------------------------------------------------------
src/libnetdata/log/wevt_netdata_mc_generate.c
+1
@@ -284,6 +284,7 @@ int main(int argc, const char **argv) {
284
" <data name=\"AlertNotificationTime\" inType=\"win:UnicodeString\"/> <!-- 62 (NDF_ALERT_NOTIFICATION_REALTIME_USEC) -->\r\n"
285
" <data name=\"Request\" inType=\"win:UnicodeString\"/> <!-- 63 (NDF_REQUEST) -->\r\n"
286
" <data name=\"Message\" inType=\"win:UnicodeString\"/> <!-- 64 (NDF_MESSAGE) -->\r\n"
287
+ " <data name=\"StackTrace\" inType=\"win:UnicodeString\"/> <!-- 65 (NDF_STACK_TRACE) -->\r\n"
288
" </template>\r\n"
289
" </templates>\r\n"
290
"\r\n"