Skip to content

Commit fcd21f3

Browse files
committed
Merge branch 'master' into feature/LOG-18200
Merging additional changes from our master branch which have been added after the feature branch was made.
2 parents 9443fb1 + aa4bdb2 commit fcd21f3

File tree

15 files changed

+877
-369
lines changed

15 files changed

+877
-369
lines changed

Cargo.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -659,7 +659,7 @@ transforms-reduce = []
659659
transforms-mezmo_reduce = ["transforms-reduce"] # depends on the upstream version for merge_strategies
660660
transforms-mezmo_aggregate = []
661661
transforms-mezmo_log_to_metric = []
662-
transforms-mezmo_log_clustering = ["dep:lru", "dep:blake2", "dep:base64"]
662+
transforms-mezmo_log_clustering = ["dep:lru", "dep:blake2", "dep:base64", "dep:tokio-postgres"]
663663
transforms-mezmo_log_classification = ["dep:grok"]
664664
transforms-mezmo_tag_cardinality_limit = ["dep:bloom", "dep:hashbrown"]
665665
transforms-remap = []
@@ -725,6 +725,7 @@ sinks-logs-mezmo = [
725725
"sinks-azure_blob",
726726
"sinks-blackhole",
727727
"sinks-console",
728+
"sinks-clickhouse",
728729
"sinks-datadog_logs",
729730
"sinks-elasticsearch",
730731
"sinks-file",

MEZMO_CHANGELOG.md

+52
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
## [1.28.1](https://github.com/answerbook/vector/compare/v1.28.0...v1.28.1) (2023-12-14)
2+
3+
4+
### Chores
5+
6+
* **classifier**: Use first string line field as message_key [6386d79](https://github.com/answerbook/vector/commit/6386d797720921bce24d4c4cedf0827d37005087) - Jorge Bay [LOG-18851](https://logdna.atlassian.net/browse/LOG-18851)
7+
8+
# [1.28.0](https://github.com/answerbook/vector/compare/v1.27.3...v1.28.0) (2023-12-14)
9+
10+
11+
### Bug Fixes
12+
13+
* **test**: increased window size to ensure nothing expires [6fa2fbe](https://github.com/answerbook/vector/commit/6fa2fbe5fc2fd6d8b60b239d3e31321d981e3348) - Dan Hable [LOG-18845](https://logdna.atlassian.net/browse/LOG-18845)
14+
15+
16+
### Features
17+
18+
* Capture log type in data profiling [c8d6828](https://github.com/answerbook/vector/commit/c8d6828cc47701786a63548b52b08370df67624d) - Jorge Bay [LOG-18784](https://logdna.atlassian.net/browse/LOG-18784) [LOG-18834](https://logdna.atlassian.net/browse/LOG-18834)
19+
20+
## [1.27.3](https://github.com/answerbook/vector/compare/v1.27.2...v1.27.3) (2023-12-13)
21+
22+
23+
### Bug Fixes
24+
25+
* Avoid resetting the log cluster templates [90258ff](https://github.com/answerbook/vector/commit/90258ff44108559c067d1d8a3e696ac5cc6e586e) - Jorge Bay [LOG-18842](https://logdna.atlassian.net/browse/LOG-18842)
26+
27+
## [1.27.2](https://github.com/answerbook/vector/compare/v1.27.1...v1.27.2) (2023-12-12)
28+
29+
30+
### Bug Fixes
31+
32+
* Reference to configmap for data profiling env vars [0349935](https://github.com/answerbook/vector/commit/0349935dde34ac0d7ef68cb57d2371d8fbdc918d) - Jorge Bay [LOG-18636](https://logdna.atlassian.net/browse/LOG-18636)
33+
34+
## [1.27.1](https://github.com/answerbook/vector/compare/v1.27.0...v1.27.1) (2023-12-11)
35+
36+
37+
### Bug Fixes
38+
39+
* **log_clustering**: Always set the current node [e41e152](https://github.com/answerbook/vector/commit/e41e1528a217d8ba16c8c30a75d5f050e1068bce) - Jorge Bay [LOG-18799](https://logdna.atlassian.net/browse/LOG-18799)
40+
41+
# [1.27.0](https://github.com/answerbook/vector/compare/v1.26.0...v1.27.0) (2023-12-08)
42+
43+
44+
### Features
45+
46+
* **clickhouse**: enable clickhouse feature [ee4b606](https://github.com/answerbook/vector/commit/ee4b6063231eba92b0029a0cff2ea128c364f7e0) - Mike Del Tito [LOG-18821](https://logdna.atlassian.net/browse/LOG-18821)
47+
48+
49+
### Miscellaneous
50+
51+
* Merge pull request #362 from answerbook/mdeltito/LOG-18821 [8f8d258](https://github.com/answerbook/vector/commit/8f8d258f202ec62aa1da8a02660cf9e2f1b00bbe) - GitHub [LOG-18821](https://logdna.atlassian.net/browse/LOG-18821)
52+
153
# [1.26.0](https://github.com/answerbook/vector/compare/v1.25.7...v1.26.0) (2023-12-07)
254

355

deployment/kubernetes/mtp-vector.yaml.envsubst

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,14 @@ spec:
158158

159159
- name: USAGE_METRICS_PROFILE_ENABLED
160160
valueFrom:
161-
secretKeyRef:
161+
configMapKeyRef:
162162
name: pipeline-env-config
163163
key: usage-metrics-profile-enabled
164164
optional: true
165165

166166
- name: USAGE_METRICS_PROFILE_FLUSH_INTERVAL_SECS
167167
valueFrom:
168-
secretKeyRef:
168+
configMapKeyRef:
169169
name: pipeline-env-config
170170
key: usage-metrics-profile-flush-interval-secs
171171
optional: true

lib/codecs/src/decoding/format/mezmo/open_telemetry/log_parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ mod tests {
212212
};
213213

214214
#[test]
215-
fn basic_to_events() {
215+
fn otlp_logs_deserialize_to_events() {
216216
let key_value = KeyValue {
217217
key: Cow::from("foo"),
218218
value: Some(AnyValue {

0 commit comments

Comments
 (0)