diff --git a/Cargo.lock b/Cargo.lock index 0240d4ebc..7303939cf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -961,7 +961,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "retis" -version = "1.1.0" +version = "1.2.0" dependencies = [ "anyhow", "bimap", @@ -999,7 +999,7 @@ dependencies = [ [[package]] name = "retis-derive" -version = "1.1.0" +version = "1.2.0" dependencies = [ "quote", "syn 2.0.28", diff --git a/Cargo.toml b/Cargo.toml index 8833b589e..46e9a2ce3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "retis" -version = "1.1.0" +version = "1.2.0" license = "GPL-2.0-only" description = "Tracing packets in the Linux networking stack, using eBPF and interfacing with control and data paths such as OvS or Netfilter" repository = "https://github.com/retis-org/retis" @@ -42,7 +42,7 @@ pcap = "1.0" plain = "0.2" rbpf = {version = "0.2", optional = true} regex = "1.7" -retis-derive = {version = "1.1", path = "./retis-derive"} +retis-derive = {version = "1.2", path = "./retis-derive"} serde = {version = "1.0", features = ["derive"]} serde_json = "1.0" serde_with = "3.0" diff --git a/README.md b/README.md index 2ce2c5597..773da7c31 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ $ retis --help ## Examples ### Drop monitoring -Listing packets being dropped by the kerenel with an associated stack trace and drop reason +Listing packets being dropped by the kernel with an associated stack trace and drop reason ``` $ retis -p dropmon collect 00:42:00 [INFO] 4 probe(s) loaded diff --git a/RELEASE.md b/RELEASE.md index 6a67e9156..98bf5ea01 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,7 +8,6 @@ 1. Run `cargo publish --dry-run` to check for any issue. 1. Open a PR and get it merged. This must have runtime tests enabled! 1. Tag the right commit in the `vx.y.z` form and push it. -1. Release on [crates.io](https://crates.io): `cargo publish`. 1. Release binaries. 1. Build a new set of packages on [copr](https://copr.fedorainfracloud.org/coprs/g/retis/retis/). 1. Update the spec file in our [copr](https://github.com/retis-org/copr) @@ -21,6 +20,7 @@ 1. `$ buildah push quay.io/retis/retis:x.y.z` 1. Manually tag on the web UI the image pushed with `latest`, if applicable. +1. Release on [crates.io](https://crates.io): `cargo publish`. 1. Write and publish a release notes in the GitHub interface. This must be done once the rpm and the image successfully built to allow pushing last minute build fixes. diff --git a/docs/README.md b/docs/README.md index 4d420eb95..d1f1bb536 100644 --- a/docs/README.md +++ b/docs/README.md @@ -23,7 +23,7 @@ output the events to the console. ``` $ retis collect -00:42:00 [INFO] Collector(s) started: skb-tracking, skb, skb-drop, ovs +00:42:00 [INFO] Collector(s) started: skb-tracking, skb, skb-drop, ovs, nft, ct 00:42:01 [INFO] 5 probe(s) loaded ... $ retis collect -c skb,skb-drop @@ -57,6 +57,7 @@ Currently supported collectors are: | skb-tracking | Packet tracking id | No[^1] | | ovs | OpenVSwitch data | Yes (many) | | nft | Nftables context | Yes (1) | +| ct | Conntrack info | No | See `retis collect --help` for a description of each collector and its command line arguments. diff --git a/retis-derive/Cargo.toml b/retis-derive/Cargo.toml index 71566777e..3d383a277 100644 --- a/retis-derive/Cargo.toml +++ b/retis-derive/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "retis-derive" -version = "1.1.0" +version = "1.2.0" edition = "2021" [lib] diff --git a/src/main.rs b/src/main.rs index d6eb9897c..7becba823 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,7 @@ use crate::{cli::get_cli, core::inspect::init_inspector, module::get_modules}; // Re-export derive macros. use retis_derive::*; -const VERSION_NAME: &str = "pizza margherita"; +const VERSION_NAME: &str = "pizza marinara"; fn main() -> Result<()> { let mut cli = get_cli()?.build();