Skip to content
This repository was archived by the owner on Mar 29, 2025. It is now read-only.

Commit 2302bc7

Browse files
ryanfoxtylerJonathan-Zollingerrderbiershivaji-kharseharshil-goel
authored
update v24 branch from main (#674)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Jonathan Zollinger <[email protected]> Co-authored-by: Raphael <[email protected]> Co-authored-by: ShivajiKharse <[email protected]> Co-authored-by: Harshil Goel <[email protected]> Co-authored-by: Harshil Goel <[email protected]> Co-authored-by: Eron Wright <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kevin Mingtarja <[email protected]> Co-authored-by: Alex B <[email protected]> Co-authored-by: Rajakavitha Kodhandapani <[email protected]> Co-authored-by: Michel Diz <[email protected]> Co-authored-by: Damián Parrino <[email protected]> Co-authored-by: Abhimanyu Singh Gaur <[email protected]>
1 parent 2243f8d commit 2302bc7

File tree

20 files changed

+120
-41
lines changed

20 files changed

+120
-41
lines changed

.github/workflows/ci-spell-checking.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v3
2323
- name: Get changed files in the content folder
2424
id: changed-files-specific
25-
uses: tj-actions/changed-files@v35
25+
uses: tj-actions/changed-files@v41
2626
with:
2727
files: ./content/
2828
- name: Install Vale

.github/workflows/stale.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
permissions:
7+
issues: write
8+
pull-requests: write
9+
10+
jobs:
11+
stale:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/stale@v9
15+
with:
16+
stale-issue-message: 'This issue has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.'
17+
stale-pr-message: 'This PR has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.'
18+
operations-per-run: 100

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,4 @@ Pass custom Go-GRPC example to the runnable by passing a `customExampleGoGRPC` t
106106
**Note:** Runnable doesn't support passing a multiline string as an argument to a shortcode. Therefore, you have to create the whole custom example in a single line string by replacing newlines with `\n`.
107107

108108
## History
109-
v24.0:
110-
=======
111109
add Hypermode banner by updating the hugo-docs repository with topbat template.

content/deploy/admin/metrics.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,28 @@ not interact directly with the filesystem. Instead it relies on
3636

3737
Metric | Description
3838
------- | -----------
39+
`badger_read_num_vlog` | Total count of reads by badger in vlog,
40+
`badger_write_num_vlog` | Total count of writes by Badger in vlog,
41+
`badger_read_bytes_vlog` | Total bytes read by Badger,
42+
`badger_write_bytes_vlog` | Total bytes written by Badger,
43+
`badger_read_bytes_lsm` | Total bytes read by Badger,
44+
`badger_write_bytes_l0` | Total bytes written by Badger,
45+
`badger_write_bytes_compaction` | Total bytes written by Badger,
46+
`badger_get_num_lsm` | Total count of LSM gets,
47+
`badger_get_num_memtable` | Total count of LSM gets from memtable,
48+
`badger_hit_num_lsm_bloom_filter` | Total count of LSM bloom hits,
49+
`badger_get_num_user` | Total count of calls to Badger's `get`,
50+
`badger_put_num_user` | Total count of calls to Badger's `put`,
51+
`badger_write_bytes_user` | Total bytes written by user,
52+
`badger_get_with_result_num_user` | Total count of calls to Badger's `get` that returned value,
53+
`badger_iterator_num_user` | Total count of iterators made in badger,
54+
`badger_size_bytes_lsm` | Size of the LSM in bytes,
55+
`badger_size_bytes_vlog` | Size of the value log in bytes,
56+
`badger_write_pending_num_memtable` | Total count of pending writes,
57+
`badger_compaction_current_num_lsm` | Number of tables being actively compacted,
58+
59+
Old Metrics (Pre 23.1.0)
60+
3961
`badger_disk_reads_total` | Total count of disk reads in Badger.
4062
`badger_disk_writes_total` | Total count of disk writes in Badger.
4163
`badger_gets_total` | Total count of calls to Badger's `get`.

content/deploy/cli-command-reference.md

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ The general syntax for superflags is as follows: `--<super-flag-name> option-a=v
4040

4141
{{% notice "note" %}}
4242
You should encapsulate the options for a superflag in double-quotes (`"`) if any
43-
of those option values include spaces. You can also encapsulate options in
44-
double-quotes to improve readability. So, you can also use the following
43+
of those option values include spaces. You can encapsulate options in
44+
double-quotes to improve readability. You can also use the following
4545
syntax for superflags: `--<super-flag-name> "option-a=value; option-b=value"`.
4646
{{% /notice %}}
4747

@@ -229,7 +229,7 @@ The commands in these groups are shown in the following table:
229229
| Dgraph debug | [`debuginfo`](#dgraph-debuginfo) | Generates information about the current node for use in debugging issues with Dgraph clusters |
230230
| Dgraph tools | [`completion`](#dgraph-completion) | Generates shell completion scripts for `bash` and `zsh` |
231231
| Dgraph tools | [`conv`](#dgraph-conv) | Converts geographic files into RDF so that they can be consumed by Dgraph |
232-
| Dgraph tools | [`decrypt`](#dgraph-decrypt) | Decrypts an export file created by an encrypted Dgraph cluster |
232+
| Dgraph tools | [`decrypt`](#dgraph-decrypt) | Decrypts an export file created by an encrypted Dgraph Cluster |
233233
| Dgraph tools | [`export_backup`](#dgraph-export_backup) | Converts a binary backup created using Dgraph Enterprise Edition into an exported folder. |
234234
| Dgraph tools | [`increment`](#dgraph-increment) | Increments a counter transactionally to confirm that a Dgraph Alpha node can handle query and mutation requests |
235235
| Dgraph tools | [`lsbackup`](#dgraph-lsbackup) | Lists information on backups in a given location |
@@ -929,7 +929,7 @@ Use "dgraph conv [command] --help" for more information about a command.
929929
#### `dgraph decrypt`
930930
931931
This command lets you decrypt an export file created by an encrypted Dgraph
932-
cluster. The following replicates the help listing shown when you run
932+
Cluster. The following replicates the help listing shown when you run
933933
`dgraph decrypt --help`:
934934
935935
```shell
@@ -1080,33 +1080,6 @@ Flags:
10801080
Use "dgraph migrate [command] --help" for more information about a command.
10811081
```
10821082
1083-
#### `dgraph raftmigrate`
1084-
1085-
This command runs the Dgraph Raft migration tool.<!-- TBD need to say more about this -->
1086-
The following replicates the help listing shown when you run `dgraph raftmigrate --help`:
1087-
1088-
```shell
1089-
Run the Raft migration tool
1090-
Usage:
1091-
dgraph raftmigrate [flags]
1092-
1093-
Flags:
1094-
--encryption_key_file string The file that stores the symmetric key of length 16, 24, or 32 bytes. The key size determines the chosen AES cipher (AES-128, AES-192, and AES-256 respectively). Enterprise feature.
1095-
-h, --help help for raftmigrate
1096-
--new-dir string Path to the new (z)w directory.
1097-
--old-dir string Path to the old (z)w directory.
1098-
--vault string Vault options
1099-
addr=http://localhost:8200; Vault server address in the form of http://ip:port
1100-
field=enc_key; Vault kv store field whose value is the base64 encoded encryption key.
1101-
format=base64; Vault field format: raw or base64.
1102-
path=secret/data/dgraph; Vault kv store path. e.g. secret/data/dgraph for kv-v2, kv/dgraph for kv-v1.
1103-
role-id-file=; File containing Vault role-id used for approle auth.
1104-
secret-id-file=; File containing Vault secret-id used for approle auth.
1105-
(default "addr=http://localhost:8200; path=secret/data/dgraph; field=enc_key; format=base64; role-id-file=; secret-id-file=;")
1106-
1107-
Use "dgraph raftmigrate [command] --help" for more information about a command.
1108-
```
1109-
11101083
#### `dgraph upgrade`
11111084
11121085
This command helps you to upgrade from an earlier Dgraph release to a newer release.

content/dql/dql-get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Alter the schema to add indexes on some of the data so queries can use term matc
135135

136136
Set the index for the `release_date`:
137137
1. Select `release_date` predicate.
138-
2. Change the type to **date**
138+
2. Change the type to **datetime**
139139
3. Select **index** and choose **year** for the index type.
140140
4. Click **Update** to apply the index on the `release-date` predicate.
141141

content/enterprise-features/binary-backups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ input RestoreTenantInput {
693693
}
694694
```
695695

696-
## Offline restore
696+
## Offline restore (DEPRECATED)
697697

698698
The restore utility is now a standalone tool. A new flag, `--encryption key-file=value`, is now part of the restore utility, so you can use it to decrypt the backup. The file specified using this flag must contain the same key that was used for encryption during backup. Alternatively, starting with `v20.07.0`, the `vault` superflag can be used to restore a backup.
699699

content/graphql/schema/directives/ids.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ In the above example, `itemID` won't be present as an argument to the `getItem`
8989
`get` queries generated for an interface will have only the `@id(interface: true)` fields as arguments.
9090
{{% /notice %}}
9191

92-
93-
### Combining `ID` and `@id`
92+
## Combining `ID` and `@id`
9493

9594
You can use both the `ID` type and the `@id` directive on another field definition to have both a unique identifier and a generated identifier.
9695

@@ -110,7 +109,7 @@ With this schema, Dgraph requires a unique `username` when creating a new user.
110109
If in a type there are multiple `@id` fields, then in a `get` query these arguments will be optional. If in a type there's only one field defined with either `@id` or `ID`, then that will be a required field in the `get` query's arguments.
111110
{{% /notice %}}
112111

113-
<!--
112+
<!--
114113
### More to come
115114
116115
We are currently considering allowing types other than `String` with `@id`, see [here](https://discuss.dgraph.io/t/id-with-type-int/10402)

content/graphql/schema/types.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ GraphQL interfaces allow you to define a generic pattern that multiple types fol
147147

148148
According to GraphQL specifications, you can have the same fields in implementing types as the interface. In such cases, the GraphQL layer will generate the correct Dgraph schema without duplicate fields.
149149

150-
If you repeat a field name in a type, it must be of the same type (including list or scalar types), and it must have the same nullable condition as the interface's field. Note that if the interface's field has a directory like `@search` then it will be inherited by the implementing type's field.
150+
If you repeat a field name in a type, it must be of the same type (including list or scalar types), and it must have the same nullable condition as the interface's field. Note that if the interface's field has a directive like `@search` then it will be inherited by the implementing type's field.
151151

152152
For example:
153153

content/releases/index.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ title = "Dgraph Releases"
66
weight = 14
77
+++
88

9-
The latest Dgraph release is the v23.1 series.
9+
The latest Dgraph release is the v24 series.
1010

1111
Dgraph releases starting v22.0.0 is following semver
1212
[See the post here](https://discuss.dgraph.io/t/dgraph-v22-0-0-rc1-20221003-release-candidate/).
@@ -20,6 +20,7 @@ To learn about the latest releases and other important announcements, watch the
2020

2121
Release | First Release Date | End of Life
2222
-----------------------|--------------------|--------------
23+
[v24.0][] | June 2024 | December 2025
2324
[v23.1][] | October 2023 | April 2025
2425
[v23.0][] | May 2023 | November 2024
2526
[v22.0][] | October 2022 | April 2024
@@ -32,6 +33,7 @@ To learn about the latest releases and other important announcements, watch the
3233
[v1.1][] | January 2020 | January 2021
3334
[v1.0][] | December 2017 | March 2020
3435

36+
[v24.0]: https://discuss.dgraph.io/t/dgraph-release-v24-0-0-is-now-available/19346
3537
[v23.1]: https://discuss.dgraph.io/t/dgraph-23-1-0-is-generally-available-on-dgraph-cloud-dockerhub-and-github/18980
3638
[v23.0]: https://discuss.dgraph.io/t/dgraph-release-v23-0-0-is-now-generally-available/18634
3739
[v22.0]: https://discuss.dgraph.io/t/dgraph-release-v22-0-2-is-now-generally-available/18117

0 commit comments

Comments
 (0)