Eugene Burkov
94cf50a53d
Pull request 1955: Upd libraries
...
Merge in DNS/adguard-home from upd-libs to master
Squashed commit of the following:
commit 72f4fb7d5ab8eaecb917a843dec56e3fa38b725c
Merge: 8defe106f 111005b8d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 10 19:50:33 2023 +0300
Merge branch 'master' into upd-libs
commit 8defe106fc982ba916f42d5722f1cc0152042d04
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Aug 10 19:38:01 2023 +0300
dnsforward: revert behavior
commit 8ccb2f675373772f8a6f829b80b317fda0c5f730
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 18:35:12 2023 +0300
all: imp code
commit a3112d3438a466bae515e56a6ee97394066ba481
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 17:26:52 2023 +0300
filtering: revert type
commit 56d2528fb4c8ee5504de0c6ec24050d63c8e6330
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 14:57:04 2023 +0300
stats: fix sort
commit 0dbb446602b7536df508a8e53c4a532455c9d064
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Aug 9 14:52:28 2023 +0300
all: upd golibs & dnsproxy
2023-08-10 20:00:17 +03:00
Dimitry Kolyshev
cbc7985e75
Pull request: querylog imp code
...
Merge in DNS/adguard-home from querylog-imp-code to master
Squashed commit of the following:
commit a58ad36508a2355b686d314dec51ac0b5e357281
Merge: df5494f2c 941eb1dd7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 15:26:55 2023 +0300
Merge remote-tracking branch 'origin/master' into querylog-imp-code
commit df5494f2c337736690a3c2a547c2d71858d0378f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 15:24:43 2023 +0300
querylog: imp code
commit 8c3c2b76dd5858e7b107f222c112e9cde2477fb3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 12:14:15 2023 +0300
all: lint script
commit be04a4decfaf20a1649d32ecaab3c1c6bb205ffd
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 12:03:12 2023 +0300
querylog: imp code
commit fe7beacff3a5cfcf2332c4998b9c65820284eaf7
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 11:57:33 2023 +0300
querylog: imp docs
commit 2ae239c57d12524fbc092f582842af2ad726c1d0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 11:46:54 2023 +0300
querylog: imp code
commit 417216cefbf154fa870f8f43468f35e0e345971f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 11:25:44 2023 +0300
querylog: imp code
commit 514b6ee99113844a4e0dad30dc53703e3220c289
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed May 24 11:14:13 2023 +0300
querylog: imp docs
commit 321351a3abb524208daacd5a3a7fbf5f07ab259d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 16:38:31 2023 +0300
querylog: imp code
commit ee91de5c43210b5bc213f933d411adb894d2e586
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 16:01:32 2023 +0300
querylog: imp code
commit 862ff12177fb769d5cb2ec250eaee538dc91d70a
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 15:07:24 2023 +0300
querylog: imp code
commit cc62c1c4ae8b813d03ccf51b596ba1ebf44d9a1f
Merge: 37ace34e9 24b41100c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 13:09:10 2023 +0300
Merge remote-tracking branch 'origin/master' into querylog-imp-code
commit 37ace34e91e5189bef6e774db960f40cdaa18270
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 11:23:08 2023 +0300
querylog: imp code
commit 8417815a6349f10b5dbad410ce28aab98bc479fa
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon May 22 11:08:29 2023 +0300
querylog: imp docs
commit 4e5cde74d25713f78675aa3e18083b4fb5e619f3
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 16:41:34 2023 +0300
querylog: imp code
commit 3494eab7006240f652a0217d305ac916bd6c3c83
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 16:13:08 2023 +0300
all: lint script
commit 704534ce6278e7d9b1bef30a3acc4e59f25693bc
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 16:12:04 2023 +0300
querylog: imp code
commit 48510102a2fa5187f78067d2b9157dac62f8bb56
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 15:52:57 2023 +0300
querylog: imp code
commit 89c273aea0e6758eb749a2d3bbaf1bc385a57797
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 15:40:50 2023 +0300
querylog: imp code
commit 0057fe64553ad38de0fda10efb9d3512c9a00e45
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri May 19 13:54:46 2023 +0300
querylog: imp code
... and 1 more commit
2023-05-24 16:33:15 +03:00
Stanislav Chzhen
18acdf9b09
Pull request 1809: 4299-querylog-stats-clients-api
...
Merge in DNS/adguard-home from 4299-querylog-stats-clients-api to master
Squashed commit of the following:
commit 066100a7869d7572c4ae65b3c7b1487ac50baf15
Merge: 95bc00c0 5da77514
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Apr 14 13:57:30 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 95bc00c0b3d05b262ee0b90be9757e61cac0778c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:48:39 2023 +0300
all: fix typo
commit 4b868da48f0c976d204346e40ba948803be6397f
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:42:52 2023 +0300
all: fix text label
commit 7a3ba5c7f688bd53cf761b5e8e614fbe251bd006
Merge: 315256e3 6c8d89a4
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Thu Apr 13 11:34:59 2023 +0300
Merge branch 'master' into 4299-querylog-stats-clients-api
commit 315256e3f3861b5116962f7c47384b7c72e41813
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Apr 11 19:07:18 2023 +0300
all: ignore search, unit
commit 28c6ffec9558e7c38d7bd12055eabddb8f5675c2
Author: Artem Krisanov <a.krisanov@adguard.com>
Date: Tue Apr 11 15:08:35 2023 +0300
Added 'Protection' and 'Query Log and statistics' sections to client settings. Added checkboxes to ignore client in (query log/statistics)
commit 2657bd2b820d8b2b3d71d23e4545c867b9ae6cdf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 17:28:59 2023 +0300
all: add todo
commit e151fcbc0c36d8e6a5c091fbf374bf0e35804699
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 15:15:46 2023 +0300
openapi: imp docs
commit 31875cbbd1bd09a73baa3636d0cc242b5ac35059
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Apr 10 13:02:31 2023 +0300
all: add querylog stats client ignore api
2023-04-14 15:25:04 +03:00
Ainar Garipov
1731ce9c63
Pull request 1795: 5661-imp-querylog-logging
...
Updates #5661 .
Squashed commit of the following:
commit 3fac63fb4ac906e61f6bb2d2af5408771d93a206
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:24:00 2023 +0300
querylog: imp locks even more
commit bf14ab9a5ea1be83ac156dc5f3d7f3717d50767b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 17:09:25 2023 +0300
querylog: imp locks more
commit 40e885f39b4c38dcd387d4799529b0fa150ed520
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 31 16:26:15 2023 +0300
querylog: imp locks, logs
2023-03-31 17:39:04 +03:00
Ainar Garipov
a772212d05
Pull request 1751: imp-querylog
...
Merge in DNS/adguard-home from imp-querylog to master
Squashed commit of the following:
commit 40b88f9dac46576399cd4d1fad52ecffd8f5945d
Merge: fcfe40b3 bb80a7c2
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 27 17:14:34 2023 +0300
Merge branch 'master' into imp-querylog
commit fcfe40b33143f82fe4ef03fd883c3159dfb06026
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Feb 27 17:13:45 2023 +0300
querylog: imp docs, names
commit 21722c6d853465c97e6f18693095a0bc86308ea3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 22 20:28:49 2023 +0300
querylog: fix race; refactor
2023-02-27 17:18:56 +03:00
Ainar Garipov
91dee0986b
Pull request 1743: upd-sorting
...
Merge in DNS/adguard-home from upd-sorting to master
Squashed commit of the following:
commit 7bd21de65c50168d5ad83ff46e63f4cbca365d23
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 21 10:57:17 2023 +0300
all: upd sorting, go-lint
2023-02-21 16:38:22 +03:00
Stanislav Chzhen
4baa6e6990
Pull request 1727: 4299-querylog-ignore
...
Merge in DNS/adguard-home from 4299-querylog-ignore to master
Squashed commit of the following:
commit 06f32fef860d63dc2af9aad8d4251918c5babd00
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 17:14:26 2023 +0300
add debug msg
commit 48fc9cf90bcb5baec4b9a7949b5be00055ad0955
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 16:30:06 2023 +0300
add line break
commit a96fe712b6e5c6a190a92b2f83ed031a85658e58
Merge: d1035219 b8d55eaf
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 16:12:32 2023 +0300
Merge branch 'master' into 4299-querylog-ignore
commit d1035219e15e5b5639b2fc39e0b17cfc05904722
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 16:11:03 2023 +0300
fix docs
commit caea5dcdf3e2ca8fe2d54cb1463226bb791470f8
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 15:30:16 2023 +0300
fix issue link
commit f6e3d122404e1363dd6dd7fa0221e8ce321354e9
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 14:34:11 2023 +0300
all: add issues links
commit 52f77188f1c3a93494585ca8a3ea16e373a8b5c6
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 13:11:58 2023 +0300
all: add log message
commit a40a0c87937abb778e4e632a5403543371b6d2e0
Merge: 87fd71ba b31bab59
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 12:16:08 2023 +0300
Merge branch 'master' into 4299-querylog-ignore
commit 87fd71ba01588f798ba944a75e6585ebdc4aa1f7
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Tue Feb 7 12:13:44 2023 +0300
all: add todo
commit c0c2ea08d36f25003c709eb2c190a147c47c2e0c
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Mon Feb 6 13:27:24 2023 +0300
all: add changelog
commit 8d227b684794e306e314d8cb848fe354d4578607
Author: Stanislav Chzhen <s.chzhen@adguard.com>
Date: Fri Feb 3 16:06:43 2023 +0300
all: querylog ignore
2023-02-07 17:50:39 +03:00
Ainar Garipov
549b20bdea
Pull request: querylog: fix oldest calc
...
Updates #4591 .
Squashed commit of the following:
commit 70b70c78c85311363535536c7ea12336b21accf8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed May 25 17:35:54 2022 +0300
querylog: fix oldest calc
2022-05-25 18:00:50 +03:00
Ainar Garipov
f53f48cc33
Pull request: all: use "ClientID" consistently
...
Closes #4242 .
Updates #4244 .
Squashed commit of the following:
commit 3a2296a7a70006cf6777e54ce1e2fc3559aec5be
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:23:43 2022 +0300
client: imp more
commit 3aacc8696ac694ff459fd33ba7beeeabd2569a55
Merge: b28a120f 2a5b5f19
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 21:21:59 2022 +0300
Merge branch 'master' into 4244-imp-i18n
commit b28a120fe9aa68507b173717059b7b259097d6a4
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Feb 9 14:49:49 2022 +0300
client: imp texts more
commit c1fa6ca336f2d5bdcc67836f348be4843a0a8f79
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Feb 8 21:12:15 2022 +0300
all: use "ClientID" consistently
2022-02-10 15:42:59 +03:00
Ainar Garipov
0bd436f4b0
Pull request: querylog: fix logic
...
Merge in DNS/adguard-home from fix-querylog-logs to master
Squashed commit of the following:
commit db6edb86f1f024c85efd3bca3ceb6dfc6ce04edd
Merge: d1981696 a3968658
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 13 13:48:25 2021 +0300
Merge branch 'master' into fix-querylog-logs
commit d1981696782ca9adc5213f76cdbe2dc9f859f921
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 10 21:14:04 2021 +0300
querylog: fix logic
2021-12-13 13:55:41 +03:00
Ainar Garipov
03a828ef51
Pull request: replace agherr with golibs' errors
...
Merge in DNS/adguard-home from golibs-errors to master
Squashed commit of the following:
commit 5aba278a31c5a213bd9e08273ce7277c57713b22
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 24 17:05:18 2021 +0300
all: imp code
commit f447eb875b81779fa9e391d98c31c1eeba7ef323
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon May 24 15:33:45 2021 +0300
replace agherr with golibs' errors
2021-05-24 17:28:11 +03:00
Ainar Garipov
7c6557b05e
Pull request: querylog: more opt
...
Updates 1273.
Squashed commit of the following:
commit 167c0b5acaab8a2676de2cea556c861dc0efbc72
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 12 18:12:43 2021 +0300
querylog: imp naming
commit 5010ad113e46335011a721cbcc9fc9b1fc623722
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 12 17:53:41 2021 +0300
querylog: more opt
2021-04-12 18:22:11 +03:00
Ainar Garipov
279350e4a3
Pull request: querylog: opt client search
...
Updates #1273 .
Squashed commit of the following:
commit 6c2cc73e3360ae12aaa6e2c9834fddfdba925e2b
Merge: effe2230 fb72d543
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 12 14:05:04 2021 +0300
Merge branch 'master' into 1273-querylog-opt
commit effe22303fb2053dfe22b6242231b40f4d462735
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Apr 12 13:21:06 2021 +0300
querylog: opt client search
2021-04-12 14:10:20 +03:00
Ainar Garipov
7c35d208b1
Pull request: querylog: search clients by name, enrich http resp
...
Updates #1273 .
Squashed commit of the following:
commit 55b78153b1b775c855e759011141bbbe6d4b962c
Author: Artem Baskal <a.baskal@adguard.com>
Date: Fri Apr 2 16:55:39 2021 +0300
Update client_info in case of null
commit 5c80c1438ed9d961af11617831b704d6ae15cc34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:24:14 2021 +0300
querylog: always set client_info
commit b48efd64d757cc0bcf5b34de22fdd0b0464d98a6
Merge: 4ed7eab5 23c9f528
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 16:22:08 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 4ed7eab52b6b5b0c0ddb5aa5a3225a62d1f9265b
Merge: dbf990eb 70d4c70e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:57:17 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit dbf990eb881116754554270e7b691b5db8e9ee34
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Apr 2 12:56:13 2021 +0300
home: imp names
commit c2cfdef494ca26fff62b9fa008f1b389d9d4d46b
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 19:26:04 2021 +0300
Rename to whois
commit e3cc4a68ee576770b1922680155308e33bed31e8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 19:03:42 2021 +0300
home: imp whois more
commit 3b8ef8691c298aff35946b35923ef2e5b1f9bbbe
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 18:51:14 2021 +0300
home: imp whois resp
commit fb97e0d74976723a512d6ff4c69e830fe59c8df8
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 18:00:03 2021 +0300
Fix client_info ids prop types
commit 298005189e372651ceff453e88aca19ee925a138
Author: Artem Baskal <a.baskal@adguard.com>
Date: Thu Apr 1 17:58:14 2021 +0300
Adapt changes on client
commit aa1769f64197d865478a66271da483babfc5dfd0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 17:18:36 2021 +0300
all: add more fields to querylog client
commit 4b2a2dbd380ec410f3068d15ea16430912e03e33
Merge: cda92c3f 2e4e2f62
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 1 16:57:26 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit cda92c3f0331cbac252f3163d31457f716bc7f2c
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 18:03:51 2021 +0300
querylog: fix windows tests
commit 5a56f0a32608869ed93a38f18f63ea3a20f7bde2
Merge: 627e4958 e710ce11
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:45:53 2021 +0300
Merge branch 'master' into 1273-querylog-client-name
commit 627e495828e82d44cc77aa393536479f23cc68b7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 29 17:44:49 2021 +0300
querylog: add tests, imp code, docs
commit 6dec468a2f0c29357875ff99458e0e8f8e580e6d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 26 16:10:47 2021 +0300
querylog: search clients by name, enrich http resp
2021-04-02 17:30:39 +03:00
Ainar Garipov
313fd7107f
Pull request: all: imp code, err handling
...
Closes #2571 .
Squashed commit of the following:
commit a5b50ee011a995f4ab3d93314acd6f0ca82d99cf
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Mar 15 14:05:25 2021 +0300
all: imp code
commit bc610f8f438549e8c6b04c8a213b5422dda2aff5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Mar 12 20:00:14 2021 +0300
all: imp code, err handling
2021-03-15 14:19:04 +03:00
Ainar Garipov
4cf44dd1d4
Pull request: all: rm var shadowing, vol. 2
...
Updates #2803 .
Squashed commit of the following:
commit bf7186378164f19ea9e21ec832526792efa2f9c3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 11 19:48:17 2021 +0300
all: rm var shadowing, vol. 2
2021-03-11 20:36:54 +03:00
Ainar Garipov
a572876775
Pull request: all: fix lint and naming issues
...
Merge in DNS/adguard-home from 2276-fix-lint to master
Updates #2276 .
Squashed commit of the following:
commit 433f44cc7b674a20ed60a9d29466ba888b3ef66e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Dec 7 14:14:28 2020 +0300
querylog: improve code and documentation
commit 851df97d2a87de5e7180a502055ee6f1a6defdca
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Dec 4 20:36:32 2020 +0300
all: fix lint and naming issues
2020-12-07 14:32:06 +03:00
Ainar Garipov
6e615c6eaa
Pull request: querylog: resort buffers
...
Merge in DNS/adguard-home from 2293-log-sort to master
Updates #2293 .
Squashed commit of the following:
commit f8961e5c52f82befe23ab1f7603a867243186498
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sat Nov 28 17:19:15 2020 +0300
all: document changes
commit c92c53307f1ed4a1c3196bdc19d23a775876b106
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Sat Nov 28 16:44:01 2020 +0300
querylog: resort buffers
2020-11-30 13:32:58 +03:00