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]>
dgraph-io · Jul 30, 2024 · 2302bc7 · 2302bc7
1 parent 2243f8d
commit 2302bc7
Show file tree

Hide file tree

Showing 20 changed files with 120 additions and 41 deletions.
diff --git a/.github/workflows/ci-spell-checking.yml b/.github/workflows/ci-spell-checking.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Get changed files in the content folder
         id: changed-files-specific
-        uses: tj-actions/changed-files@v35
+        uses: tj-actions/changed-files@v41
         with:
           files: ./content/
       - name: Install Vale

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,18 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: 'This issue has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.'
+          stale-pr-message: 'This PR has been stale for 60 days and will be closed automatically in 7 days. Comment to keep it open.'
+          operations-per-run: 100
diff --git a/README.md b/README.md
@@ -106,6 +106,4 @@ Pass custom Go-GRPC example to the runnable by passing a `customExampleGoGRPC` t
 **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`.
 
 ## History
-v24.0:
-=======
 add Hypermode banner by updating the hugo-docs repository with topbat template.
diff --git a/content/deploy/admin/metrics.md b/content/deploy/admin/metrics.md
@@ -36,6 +36,28 @@ not interact directly with the filesystem. Instead it relies on
 
  Metric                          	 | Description
  -------                          	 | -----------
+ `badger_read_num_vlog` | Total count of reads by badger in vlog,
+ `badger_write_num_vlog` | Total count of writes by Badger in vlog,
+ `badger_read_bytes_vlog` |  Total bytes read by Badger,
+ `badger_write_bytes_vlog` |  Total bytes written by Badger,
+ `badger_read_bytes_lsm` |  Total bytes read by Badger,
+ `badger_write_bytes_l0` |  Total bytes written by Badger,
+ `badger_write_bytes_compaction` |  Total bytes written by Badger,
+ `badger_get_num_lsm` | Total count of LSM gets,
+ `badger_get_num_memtable` | Total count of LSM gets from memtable,
+ `badger_hit_num_lsm_bloom_filter` | Total count of LSM bloom hits,
+ `badger_get_num_user` | Total count of calls to Badger's `get`,
+ `badger_put_num_user` | Total count of calls to Badger's `put`,
+ `badger_write_bytes_user` |  Total bytes written by user,
+ `badger_get_with_result_num_user` | Total count of calls to Badger's `get` that returned value,
+ `badger_iterator_num_user` | Total count of iterators made in badger,
+ `badger_size_bytes_lsm` | Size of the LSM in bytes,
+ `badger_size_bytes_vlog` | Size of the value log in bytes,
+ `badger_write_pending_num_memtable` | Total count of pending writes,
+ `badger_compaction_current_num_lsm` | Number of tables being actively compacted,
+
+ Old Metrics (Pre 23.1.0)
+
  `badger_disk_reads_total`        | Total count of disk reads in Badger.
  `badger_disk_writes_total`       | Total count of disk writes in Badger.
  `badger_gets_total`              | Total count of calls to Badger's `get`.

diff --git a/content/deploy/cli-command-reference.md b/content/deploy/cli-command-reference.md
@@ -40,8 +40,8 @@ The general syntax for superflags is as follows: `--<super-flag-name> option-a=v
 
 {{% notice "note" %}}
 You should encapsulate the options for a superflag in double-quotes (`"`) if any
-of those option values include spaces. You can also encapsulate options in
-double-quotes to improve readability. So, you can also use the following
+of those option values include spaces. You can encapsulate options in
+double-quotes to improve readability. You can also use the following
 syntax for superflags: `--<super-flag-name> "option-a=value; option-b=value"`.
 {{% /notice %}}
 
@@ -229,7 +229,7 @@ The commands in these groups are shown in the following table:
 | Dgraph debug     | [`debuginfo`](#dgraph-debuginfo)    | Generates information about the current node for use in debugging issues with Dgraph clusters   |
 | Dgraph tools     | [`completion`](#dgraph-completion)    | Generates shell completion scripts for `bash` and `zsh`     |
 | Dgraph tools     | [`conv`](#dgraph-conv)    | Converts geographic files into RDF so that they can be consumed by Dgraph    |
-| Dgraph tools     | [`decrypt`](#dgraph-decrypt)    | Decrypts an export file created by an encrypted Dgraph cluster     |
+| Dgraph tools     | [`decrypt`](#dgraph-decrypt)    | Decrypts an export file created by an encrypted Dgraph Cluster     |
 | Dgraph tools     | [`export_backup`](#dgraph-export_backup)    | Converts a binary backup created using Dgraph Enterprise Edition into an exported folder.      |
 | Dgraph tools     | [`increment`](#dgraph-increment)    | Increments a counter transactionally to confirm that a Dgraph Alpha node can handle query and mutation requests |
 | 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.
 #### `dgraph decrypt`
 
 This command lets you decrypt an export file created by an encrypted Dgraph
-cluster. The following replicates the help listing shown when you run
+Cluster. The following replicates the help listing shown when you run
 `dgraph decrypt --help`:
 
 ```shell
@@ -1080,33 +1080,6 @@ Flags:
 Use "dgraph migrate [command] --help" for more information about a command.
 ```
 
-#### `dgraph raftmigrate`
-
-This command runs the Dgraph Raft migration tool.<!-- TBD need to say more about this -->
-The following replicates the help listing shown when you run `dgraph raftmigrate --help`:
-
-```shell
-Run the Raft migration tool
-Usage:
- dgraph raftmigrate [flags]
-
-Flags:
-     --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.
- -h, --help                         help for raftmigrate
-     --new-dir string               Path to the new (z)w directory.
-     --old-dir string               Path to the old (z)w directory.
-     --vault string                 Vault options
-                                        addr=http://localhost:8200; Vault server address in the form of http://ip:port
-                                        field=enc_key; Vault kv store field whose value is the base64 encoded encryption key.
-                                        format=base64; Vault field format: raw or base64.
-                                        path=secret/data/dgraph; Vault kv store path. e.g. secret/data/dgraph for kv-v2, kv/dgraph for kv-v1.
-                                        role-id-file=; File containing Vault role-id used for approle auth.
-                                        secret-id-file=; File containing Vault secret-id used for approle auth.
-                                     (default "addr=http://localhost:8200; path=secret/data/dgraph; field=enc_key; format=base64; role-id-file=; secret-id-file=;")
-
-Use "dgraph raftmigrate [command] --help" for more information about a command.
-```
-
 #### `dgraph upgrade`
 
 This command helps you to upgrade from an earlier Dgraph release to a newer release.

diff --git a/content/dql/dql-get-started.md b/content/dql/dql-get-started.md
@@ -135,7 +135,7 @@ Alter the schema to add indexes on some of the data so queries can use term matc
 
 Set the index for the `release_date`:
 1.    Select `release_date` predicate.
-2.    Change the type to **date**
+2.    Change the type to **datetime**
 3.    Select **index** and choose **year** for the index type.
 4.    Click **Update** to apply the index on the `release-date` predicate.
 

diff --git a/content/enterprise-features/binary-backups.md b/content/enterprise-features/binary-backups.md
@@ -693,7 +693,7 @@ input RestoreTenantInput {
 }
 ```
 
-## Offline restore
+## Offline restore (DEPRECATED)
 
 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.
 

diff --git a/content/graphql/schema/directives/ids.md b/content/graphql/schema/directives/ids.md
@@ -89,8 +89,7 @@ In the above example, `itemID` won't be present as an argument to the `getItem`
 `get` queries generated for an interface will have only the `@id(interface: true)` fields as arguments.
 {{% /notice %}}
 
-
-### Combining `ID` and `@id`
+## Combining `ID` and `@id`
 
 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.
 
@@ -110,7 +109,7 @@ With this schema, Dgraph requires a unique `username` when creating a new user.
 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.
 {{% /notice %}}
 
-<!-- 
+<!--
 ### More to come
 
 We are currently considering allowing types other than `String` with `@id`, see [here](https://discuss.dgraph.io/t/id-with-type-int/10402)

diff --git a/content/graphql/schema/types.md b/content/graphql/schema/types.md
@@ -147,7 +147,7 @@ GraphQL interfaces allow you to define a generic pattern that multiple types fol
 
 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.
 
-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.
+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.
 
 For example:
 

diff --git a/content/releases/index.md b/content/releases/index.md
@@ -6,7 +6,7 @@ title = "Dgraph Releases"
   weight = 14
 +++
 
-The latest Dgraph release is the v23.1 series.
+The latest Dgraph release is the v24 series.
 
 Dgraph releases starting v22.0.0 is following semver
 [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
 
  Release               | First Release Date | End of Life
 -----------------------|--------------------|--------------
+ [v24.0][]             | June 2024          | December 2025
  [v23.1][]             | October 2023       | April 2025
  [v23.0][]             | May 2023           | November 2024
  [v22.0][]             | October 2022       | April 2024
@@ -32,6 +33,7 @@ To learn about the latest releases and other important announcements, watch the
  [v1.1][]              | January 2020       | January 2021
  [v1.0][]              | December 2017      | March 2020
 
+[v24.0]: https://discuss.dgraph.io/t/dgraph-release-v24-0-0-is-now-available/19346
 [v23.1]: https://discuss.dgraph.io/t/dgraph-23-1-0-is-generally-available-on-dgraph-cloud-dockerhub-and-github/18980
 [v23.0]: https://discuss.dgraph.io/t/dgraph-release-v23-0-0-is-now-generally-available/18634
 [v22.0]: https://discuss.dgraph.io/t/dgraph-release-v22-0-2-is-now-generally-available/18117

diff --git a/diagrams/GraphQL_Logo.png b/diagrams/GraphQL_Logo.png
diff --git a/diagrams/apollo.png b/diagrams/apollo.png
diff --git a/diagrams/curl.png b/diagrams/curl.png
diff --git a/diagrams/dgraph.png b/diagrams/dgraph.png
diff --git a/diagrams/dgraph.py b/diagrams/dgraph.py
@@ -0,0 +1,59 @@
+from diagrams import Cluster, Diagram, Edge
+from diagrams.programming.language import Go, Nodejs, Python
+from diagrams.custom import Custom
+
+graph_attr = {
+    "layout":"dot",
+    "compound":"true",
+    "splines":"spline",
+    }
+
+zeros_attr = {
+    "icon_path":"./dgraphlg.png"
+}
+
+ec2_attr = {
+    "icon_path":"./dgraphlgEC2.png"
+}
+
+with Diagram("\ndgraph", show=False, direction="TB", graph_attr=graph_attr, outformat='png') as diag:
+    with Cluster("RAFT Groups / Cluster (Baremetal example)"):
+        with Cluster("0", graph_attr={"label":"Zero Group"}):
+            a = Custom("Zero 2",  **zeros_attr)
+            b = Custom("Zero 1",  **zeros_attr)
+            c = Custom("Zero 0",  **zeros_attr)
+
+        with Cluster("1", graph_attr={"label":"Alpha Group"}):
+            e = Custom("Alpha 4",  **ec2_attr)
+            f = Custom("Alpha 5",  **ec2_attr)
+            g = Custom("Alpha 6",  **ec2_attr)
+            h = Custom("Alpha 3",  **ec2_attr)
+            i = Custom("Alpha 2",  **ec2_attr)
+            j = Custom("Alpha 1",  **ec2_attr)
+            h = Custom("Alpha 0",  **ec2_attr)
+
+    with Cluster("2", graph_attr={"label":"APIs"}):
+        e1 = Custom("RAW HTTP", "./http.png")
+        f1 = Custom("gRPC", "./grpc.png") 
+        g1 = Custom("GraphQL ", "./GraphQL_Logo.png")
+
+    with Cluster("3", graph_attr={"label":"Special Node(EE)"}):
+        Learner = Custom("Learner 0",  **ec2_attr)
+
+    with Cluster("4", graph_attr={"label":"Clients"}):
+        client2 = Custom("Apollo GraphQL ", "./apollo.png")
+        client3 = Nodejs("Dgraph-JS")
+        client4 = Python("Pydgraph")
+        client0 = Go("Dgo")
+        client1 = Custom("Curl", "./curl.png")
+
+    b >> Edge(lhead="cluster_1") >> f
+
+    g >> Edge(ltail="cluster_1") >> Learner
+    e >> Edge(ltail="cluster_2") >> e1
+
+    g1 >> Edge(lhead="cluster_4") >> client2
+    f1 >> Edge(lhead="cluster_4") >> client0
+    e1 >> Edge(lhead="cluster_4") >> client1
+
+diag
diff --git a/diagrams/dgraphlg.png b/diagrams/dgraphlg.png
diff --git a/diagrams/dgraphlgEC2.png b/diagrams/dgraphlgEC2.png
diff --git a/diagrams/grpc.png b/diagrams/grpc.png
diff --git a/diagrams/http.png b/diagrams/http.png
diff --git a/diagrams/readme.md b/diagrams/readme.md
@@ -0,0 +1,8 @@
+
+# Create a new Diagram
+
+sudo apt install graphviz
+
+pip install diagrams
+
+python3 dgraph.py