diff options
| author | Andris Mednis <Andris.Mednis@zabbix.com> | 2021-11-17 18:17:39 +0300 |
|---|---|---|
| committer | Andris Mednis <Andris.Mednis@zabbix.com> | 2021-11-26 02:54:27 +0300 |
| commit | 3c91be75fc45b81df6f5a9f3e9d548395e0985bf (patch) | |
| tree | 3c6329428ed562730c9bbc55b10c5f36eb308459 /build | |
| parent | 72ca580c0f2495cd20849fb2f8ebae029b6b4afb (diff) | |
..FG...... [ZBXNEXT-6593] added support of persistent files for restoring log item state after agent restart
* commit '4d17dc41cc1b295a2d0e628318740815f98ea635': (31 commits)
...G...... [ZBXNEXT-6593] fixed zbx_read2() to not create persistent file data in case of regexp error
...G...... [ZBXNEXT-6593] fixed compilation warning in zbx_restore_file_details()
.D........ [ZBXNEXT-6593] added ChangeLog entry
...G...... [ZBXNEXT-6593] fixed process_log_check() to recover data from persistent file only if no preexisting state
...G...... [ZBXNEXT-6593] fixed process_logrt() - hiding of errors when recalculating MD5 sums for small files
...G...... [ZBXNEXT-6593] modified agent to write complete persistent files if possible in case of sending metadata or 'item not supported' message
...G...... [ZBXNEXT-6593] fixed compilation warning in zbx_create_persistent_server_directory()
...G...... [ZBXNEXT-6593] fixed comment in is_same_file_logcpt()
..F....... [ZBXNEXT-6593] added 'persistent_dir' parameter to items 'help' descriptions in frontend
...G...... [ZBXNEXT-6593] fixed error handling in zbx_write_persistent_files(), coding style in zbx_remove_from_persistent_inactive_list()
...G...... [ZBXNEXT-6593] fixed error handling in zbx_write_persistent_file()
...G...... [ZBXNEXT-6593] fixed memory leak in zbx_create_persistent_server_directory()
...G...... [ZBXNEXT-6593] fixed compilation of Agent2
...G...... [ZBXNEXT-6593] replaced numeric buffer size for MD5 sum with macro
...G...... [ZBXNEXT-6593] fixed comment typo
...G...... [ZBXNEXT-6593] fixed agent compilation on MS Windows, fixed compilation warnings
...G...... [ZBXNEXT-6593] replaced numeric constants with macro definition in print_logfile_list()
...G...... [ZBXNEXT-6593] fixed comments with typo 'the the'
...G...... [ZBXNEXT-6593] fixed compilation warnings in zbx_hex2bin()
...G...... [ZBXNEXT-6593] added support of persistent files on Unix platform
...
(cherry picked from commit 9aba72d6725211e0ca915e998602cdf218bbc639)
Conflicts:
include/common.h
src/go/pkg/procfs/procfs.go
src/go/pkg/zbxlib/logfile.go
src/libs/zbxcommon/misc.c
src/zabbix_agent/active.c
src/zabbix_agent/logfiles/logfiles.c
src/zabbix_agent/logfiles/logfiles.h
ui/include/classes/items/CHelpItems.php replaced by ui/include/classes/data/CItemData.php
(cherry picked from commit 3c9d7ac59644fc9ceaf0ac253a4c6d1f3dd3ae4d)
Diffstat (limited to 'build')
| -rw-r--r-- | build/mingw/Makefile | 4 | ||||
| -rw-r--r-- | build/win32/project/Makefile_agent | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/build/mingw/Makefile b/build/mingw/Makefile index 46097f96553..8e08f499747 100644 --- a/build/mingw/Makefile +++ b/build/mingw/Makefile @@ -24,6 +24,7 @@ OBJS = \ $(OUTPUTDIR)\sysinfo.o \ $(OUTPUTDIR)\vector.o \ $(OUTPUTDIR)\zbxregexp.o \ + $(OUTPUTDIR)\persistent_state.o \ $(OUTPUTDIR)\logfiles.o \ $(OUTPUTDIR)\file.o \ $(OUTPUTDIR)\alias.o \ @@ -163,6 +164,9 @@ $(OUTPUTDIR)\algodefs.o: $(TOPDIR)\src\libs\zbxalgo\algodefs.c $(OUTPUTDIR)\zbxregexp.o: $(TOPDIR)\src\libs\zbxregexp\zbxregexp.c $(CC) $(CFLAGS) -DUNICODE -DPCRE_STATIC -c $^ -o $@ +$(OUTPUTDIR)\persistent_state.o: $(TOPDIR)\src\zabbix_agent\logfiles\persistent_state.c + $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@ + $(OUTPUTDIR)\logfiles.o: $(TOPDIR)\src\zabbix_agent\logfiles\logfiles.c $(CC) $(CFLAGS) -DUNICODE -c $^ -o $@ diff --git a/build/win32/project/Makefile_agent b/build/win32/project/Makefile_agent index b892c9084ae..35b32ddfcac 100644 --- a/build/win32/project/Makefile_agent +++ b/build/win32/project/Makefile_agent @@ -101,6 +101,7 @@ OBJS = \ ..\..\..\src\zabbix_agent\cpustat.o \ ..\..\..\src\zabbix_agent\eventlog.o \ ..\..\..\src\zabbix_agent\listener.o \ + ..\..\..\src\zabbix_agent\logfiles\persistent_state.o \ ..\..\..\src\zabbix_agent\logfiles\logfiles.o \ ..\..\..\src\zabbix_agent\perfstat.o \ ..\..\..\src\zabbix_agent\stats.o \ |