Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into OPW-102-vector-lib-…
Browse files Browse the repository at this point in the history
  • Loading branch information
bruceg committed Oct 25, 2023
2 parents f09c016 + 239cf94 commit 2a750e8
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 11 deletions.
5 changes: 5 additions & 0 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ badunit
bak
barfoo
barieom
basearch
baseof
basevalue
baskinc
Expand Down Expand Up @@ -450,6 +451,8 @@ gogoproto
goldberg
goldmark
GPB
gpgcheck
gpgkey
gqlgen
graphqlconfig
grault
Expand Down Expand Up @@ -575,6 +578,7 @@ kernelmode
keybase
keyclock
keyid
keyring
keyxxxxx
khvzak
kib
Expand Down Expand Up @@ -635,6 +639,7 @@ lukesteensen
macports
MAINPID
majorly
makecache
MAKECMDGOALS
Makefiles
markability
Expand Down
6 changes: 6 additions & 0 deletions netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ to = "https://www.datadoghq.com/product/observability-pipelines"
status = 301
force = true

[[redirects]]
from = "https://setup.vector.dev/*"
to = "https://s3.amazonaws.com/dd-agent/scripts/install_script_vector0.sh"
status = 302
force = true

# Removed pages redirects
[[redirects]]
from = "/docs/reference/configuration/field-path-notation/"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ Our APT repositories are provided by [Cloudsmith] and you can find [instructions
First, add the Vector repo:

```shell
curl -1sLf \
'https://repositories.timber.io/public/vector/cfg/setup/bash.deb.sh' \
| sudo -E bash
bash -c "$(curl -L https://setup.vector.dev)"
```

Then you can install the `vector` package:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,31 @@ weight: 2
curl \
--proto '=https' \
--tlsv1.2 -O \
https://packages.timber.io/vector/{{< version >}}/vector_{{< version >}}-1_amd64.deb
https://apt.vector.dev/pool/v/ve/vector_{{< version >}}-1_{arch}.deb

sudo dpkg -i vector_{{< version >}}-1_amd64.deb
sudo dpkg -i vector_{{< version >}}-1_{arch}.deb
```

Make sure to replace `{arch}` with one of the following:

* `amd64`
* `arm64`
* `armhf`

## Other actions

{{< tabs default="Upgrade Vector" >}}
{{< tab title="Upgrade Vector" >}}

```shell
dpkg -i vector-{{< version >}}-amd64
dpkg -i vector-{{< version >}}-{arch}
```

{{< /tab >}}
{{< tab title="Uninstall Vector" >}}

```shell
dpkg -r vector-{{< version >}}-amd64
dpkg -r vector-{{< version >}}-{arch}
```

{{< /tab >}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ RPM Package Manager is a free and open source package management system for inst
## Installation

```shell
sudo rpm -i https://packages.timber.io/vector/{{< version >}}/vector-{{< version >}}-1.{arch}.rpm
sudo rpm -i https://yum.vector.dev/stable/vector-0/{arch}/vector-{{< version >}}-1.{arch}.rpm
```

Make sure to replace `{arch}` with one of the following:

* `x86_64`
* `aarch64`
* `armv7`
* `armv7hl`

## Other actions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ Our Yum repositories are provided by [Cloudsmith] and you can find [instructions
Add the repo:

```shell
curl -1sLf 'https://repositories.timber.io/public/vector/cfg/setup/bash.rpm.sh' \
| sudo -E bash
bash -c "$(curl -L https://setup.vector.dev)"
```

Then you can install Vector:
Expand Down
130 changes: 130 additions & 0 deletions website/content/en/highlights/2023-11-07-new-linux-repos.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
---
date: "2023-11-07"
title: "A New Home for Linux Packages"
description: ""
authors: ["spencergilbert"]
pr_numbers: []
release: "0.34.0"
hide_on_release_notes: false
badges:
type: "announcement"
---

Starting with Vector's `0.34.0` release, the `deb` and `rpm` packages will have
a new home at `vector.dev` courtesy of Datadog.

We will continue to maintain the existing `timber.io` hosting until **February
28th**, but we **will not** publish future minor release versions to them
starting with the next release, `0.35.0`. Any patch releases for `0.34.0` will
be published to the existing repositories, as well as the new ones.

{{< warning >}}
On February 28th, the `timber.io` package repositories will be decommissioned.
All future minor releases will only be published to the new `vector.dev` package
repositories and not to the `timber.io` repositories.
{{< /warning >}}

We aim to make this a seamless transition by providing time for you to switch
repositories, as well as by publishing previous versions of Vector with the new
repository as a drop-in replacement, so you don't have to update your Vector
version at the same time.

If you have any questions or concerns don't hesitate to reach out on [Discord]
or [Discussions]!

## Migration guide

The following command **removes** the existing repository and configures the
new repository.

```sh
CSM_MIGRATE=true bash -c "$(curl -L https://setup.vector.dev)"
```

Alternatively, `CSM_MIGRATE` may be left unset to leave the removal of the
existing repository to your discretion.

### Manual step-by-step instructions

<details>
<summary>APT</summary>
1. Remove the existing repository:

```sh
rm "/etc/apt/sources.list.d/timber-vector.list"
```

2. Run the following commands to set up APT to download through HTTPS:

```sh
sudo apt-get update
sudo apt-get install apt-transport-https curl gnupg
```

3. Run the following commands to set up the Vector `deb` repo on your system
and create a Datadog archive keyring:

```sh
echo "deb [signed-by=/usr/share/keyrings/datadog-archive-keyring.gpg] https://apt.vector.dev/ stable vector-0" | sudo tee "/etc/apt/sources.list.d/vector.list"
sudo touch /usr/share/keyrings/datadog-archive-keyring.gpg
sudo chmod a+r /usr/share/keyrings/datadog-archive-keyring.gpg
curl https://keys.datadoghq.com/DATADOG_APT_KEY_CURRENT.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
curl https://keys.datadoghq.com/DATADOG_APT_KEY_F14F620E.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
curl https://keys.datadoghq.com/DATADOG_APT_KEY_C0962C7D.public | sudo gpg --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg --import --batch
```

4. Run the following commands to update your local `apt` repo and install Vector:

```sh
sudo apt-get update
sudo apt-get install vector
```

</details>

<details>
<summary>RPM</summary>

1. Remove the existing repository:

```sh
rm "/etc/yum.repos.d/timber-vector.repo"
```

2. Run the following commands to set up the Vector `rpm` repo on your system:

```sh
cat <<EOF > /etc/yum.repos.d/vector.repo
[vector]
name = Vector
baseurl = https://yum.vector.dev/stable/vector-0/\$basearch/
enabled=1
gpgcheck=1
repo_gpgcheck=1
gpgkey=https://keys.datadoghq.com/DATADOG_RPM_KEY_CURRENT.public
https://keys.datadoghq.com/DATADOG_RPM_KEY_B01082D3.public
https://keys.datadoghq.com/DATADOG_RPM_KEY_FD4BF915.public
EOF
```

**Note:** If you are running RHEL 8.1 or CentOS 8.1, use `repo_gpgcheck=0` instead of `repo_gpgcheck=1` in the configuration above.

3. Update your packages and install Vector:

```sh
sudo yum makecache
sudo yum install vector
```

</details>

### Notes

* While the existing packages were migrated without rebuilding them, the RPM
packages _were_ re-signed with a Datadog GPG key. This will cause checksums
to not match between equivalent packages from `vector.dev` and `timber.io`.
* Once packages are released only to `vector.dev`, APT packages will be signed
by a Datadog GPG key. This update will be announced in advance.

[Discord]: https://chat.vector.dev/
[Discussions]: https://discussions.vector.dev/
16 changes: 16 additions & 0 deletions website/cue/reference/remap/expressions/function_call.cue
Original file line number Diff line number Diff line change
Expand Up @@ -167,5 +167,21 @@ remap: expressions: function_call: {
"""#
return: ["hello", "world!"]
},
{
title: "Infallible function invocation"
source: #"""
split("apples and pears and bananas", " and ")
"""#
return: ["apples", "pears", "bananas"]
},
{
title: "Fallible function invocation"
input: log: message: "apples and pears and bananas"
source: #"""
# The compiler cannot determine the argument type thus we need to do error handling.
split!(.message, " and ")
"""#
return: ["apples", "pears", "bananas"]
},
]
}

0 comments on commit 2a750e8

Please sign in to comment.