Updating from master

RedisLabs · Aug 16, 2021 · b7cc310 · b7cc310
2 parents 4d39d7c + afd9947
commit b7cc310
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 34 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -96,6 +96,13 @@ jobs:
                     export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
                     export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
                     aws s3 sync public s3://docs.redis.com/$LOCATION --delete --acl public-read # --size-only
+            # Purge the site cache to force the deployed changes to display immediately
+            - run:
+                name: Purge site cache
+                command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
+                    aws cloudfront create-invalidation --distribution-id=${CLOUDFRONT_DISTRIBUTION_ID} --paths "/staging/*"
 
     # Deploy only RS site files to the AWS S3 bucket for the branch
     deploy-docs-prod:
@@ -108,13 +115,26 @@ jobs:
             # Set the signature version for the S3 auth
             - run:
                 name: Setting Signature Version 4 for S3 Request Authentication
-                command: aws configure set default.s3.signature_version s3v4
+                command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
+                    aws configure set default.s3.signature_version s3v4
             # Deploy to the S3 bucket corresponding to the current branch
             - run:
                 name: Replace existing site files on the AWS S3 bucket for the branch
                 command:  |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
                     export VERSION=${CIRCLE_BRANCH/-build/}
                     aws s3 sync public s3://docs.redis.com/$VERSION --delete --acl public-read --exclude "*rv/*" --exclude "*rc/*" # --size-only
+            # Purge the site cache to force the deployed changes to display immediately
+            - run:
+                name: Purge site cache
+                command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
+                    export VERSION=${CIRCLE_BRANCH/-build/}
+                    aws cloudfront create-invalidation --distribution-id=${CLOUDFRONT_DISTRIBUTION_ID} --paths "/${VERSION}/*"
 
     # Deploy for -build to push to /{version} without -build
     deploy-docs-latest:
@@ -127,11 +147,16 @@ jobs:
             # Set the signature version for the S3 auth
             - run:
                 name: Setting Signature Version 4 for S3 Request Authentication
-                command: aws configure set default.s3.signature_version s3v4
+                command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
+                    aws configure set default.s3.signature_version s3v4
             # Declare target location for baseURL and deployment location and deploy to the S3 bucket corresponding to the current branch
             - run:
                 name: Deploy site files to the AWS S3 bucket and set HTML, CSS, and JS files to expire for immediate client update
                 command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
                     # Set aws S3 target location to branch_name
                     export LOCATION=${CIRCLE_BRANCH}
                     # Deploy HTML and CSS files to the S3 bucket corresponding to the current branch
@@ -142,6 +167,13 @@ jobs:
                     aws s3 cp robots.txt s3://docs.redis.com/robots.txt
                     # Deploy the S3 site configuration
                     aws s3api put-bucket-website --bucket docs.redis.com --website-configuration file://website.json
+            # Purge the site cache to force the deployed changes to display immediately
+            - run:
+                name: Purge site cache
+                command: |
+                    export AWS_ACCESS_KEY_ID=${AWS_DOCS_ACCESS_KEY_ID}
+                    export AWS_SECRET_ACCESS_KEY=${AWS_DOCS_SECRET_ACCESS_KEY}
+                    aws cloudfront create-invalidation --distribution-id=${CLOUDFRONT_DISTRIBUTION_ID} --paths "/latest/*" "/robots.txt"
 workflows:
   version: 2
   build-deploy:

diff --git a/config.toml b/config.toml
@@ -39,7 +39,7 @@ highlightClientSide = false # set true to use highlight.pack.js instead of the d
 menushortcutsnewtab = false # set true to open shortcuts links to a new tab/window
 enableGitInfo = true
 googleAnalytics = "UA-92003007-1"
-googleTagManager = "GTM-TKZ6J9R"
+googleTagManager = "GTM-KNWQXKB"
 
 mac_dl_link = "https://downloads.redisinsight.redislabs.com/latest/redisinsight-mac.dmg"
 linux_dl_link = "https://downloads.redisinsight.redislabs.com/latest/redisinsight-linux64"

diff --git a/content/platforms/kubernetes/tasks/run-log-collector-script.md b/content/platforms/kubernetes/tasks/run-log-collector-script.md
@@ -0,0 +1,25 @@
+---
+Title: Run the log collector script
+linkTitle: Run log_collector.py
+description: Run the log collector script to package relevant logs into a tar.gz file to send to Redis Support for help troubleshooting your Kubernetes environment.
+weight: 89
+alwaysopen: false
+categories: ["Platforms"]
+aliases: 
+---
+
+The Redis Enterprise cluster (REC) log collector script ([`log_collector.py`](https://github.com/RedisLabs/redis-enterprise-k8s-docs/blob/master/log_collector/log_collector.py)) creates and fills a directory with the relevant logs for your environment. These logs will help the support team with troubleshooting. 
+
+1. Download the [`log_collector.py`](https://github.com/RedisLabs/redis-enterprise-k8s-docs/blob/master/log_collector/log_collector.py) file.
+2. Run the script on the system that runs your `kubectl` or `oc` commands.
+    - Pass `-n` parameter to run on a different namespace than the one you are currently on.
+    - Run with `-h` to see options.
+
+    ```bash
+    python log_collector.py
+    ```
+
+  {{< note >}} If you get an error because the yaml module is not found, install the pyYAML module with `pip install pyyaml`.
+  {{< /note >}}
+
+3. Upload the resulting `tar.gz` file containing all the logs to [Redis Support](https://support.redislabs.com/).
diff --git a/content/rc/databases/import-data.md b/content/rc/databases/import-data.md
@@ -11,6 +11,9 @@ aliases: /rv/how-to/importing-dataset-redis-cloud/
          /rc/how-to/importing-data-database/
          /rc/how-to/importing-data-database.md
          /rc/databases/import-data/
+         /rv/how-to/importing-data/
+         /rc/how-to/importing-data/
+         /rc/how-to/importing-data.md                  
 ---
 You can import an existing dataset into your Redis Cloud instance from an existing Redis server or an RDB file.
 

diff --git a/layouts/partials/custom-head.html b/layouts/partials/custom-head.html
@@ -2,7 +2,4 @@
   {{ with .Site.Params.googleTagManager }}
     {{ partial "gtm-head" . | safeHTML }}
   {{ end }}
-  {{ with .Site.Params.googleAnalytics }}
-    {{ partial "ga-head" . | safeHTML }}
-  {{ end }}
 {{ end }}
diff --git a/layouts/partials/flex/scripts.html b/layouts/partials/flex/scripts.html
@@ -90,17 +90,6 @@
 {{end}}
 <!-- /Platforms version selector -->
 
-<script>
-  // Set up GA Event tracking
-  setTimeout(function(){
-    if(window.ga) {
-      window.ga('create', 'UA-92003007-1', {
-          'clientId': window.ga.getAll()[0].get('clientId')
-      });
-    }
-  }, 400);
-</script>
-
 <script>
   // Compliance dialog
   function acceptGDPR() {

diff --git a/layouts/partials/ga-head.html b/layouts/partials/ga-head.html
diff --git a/layouts/partials/gtm-head.html b/layouts/partials/gtm-head.html
@@ -3,8 +3,8 @@
     w[l] = w[l] || []; w[l].push({
         'gtm.start':
             new Date().getTime(), event: 'gtm.js'
-    }); var f = d.getElementsByTagName(s)[0],
-        j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
-            'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
-    })(window, document, 'script', 'dataLayer', 'GTM-TKZ6J9R');</script>
-<!-- End Google Tag Manager -->
+        }); var f = d.getElementsByTagName(s)[0],
+            j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : ''; j.async = true; j.src =
+                'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+    })(window, document, 'script', 'dataLayer', 'GTM-KNWQXKB');</script>
+<!-- End Google Tag Manager -->
diff --git a/static/theme-flex/style.css b/static/theme-flex/style.css
@@ -76,11 +76,12 @@ header .logo {
   position: absolute;
   left: 0;
   top: 50%;
-  margin-top: -20px;  
+  margin-top: -20px; 
 }
 
 header .logo img {
   width: 163px !important;
+  height: 40px;
 }
 
 header nav.shortcuts {
@@ -3610,3 +3611,17 @@ a[href*="#no-click"], img[src*="#no-click"] {
   margin-bottom: 40px;
 }
 
+/* CSS hacks - Aug 2021 */
+#root,
+#drift-widget-message-preview-wrapper {
+  display: none !important;
+}
+
+article section.page table {
+  table-layout: auto !important;
+}
+
+.gdpr-modal {
+  z-index: 9999;
+}
+
diff --git a/website.json b/website.json
@@ -21,7 +21,7 @@
                 "KeyPrefixEquals": "6.0/rc/"
             },
             "Redirect": {
-                "HostName": "docs.redislabs.com",
+                "HostName": "docs.redis.com",
                 "Protocol": "https",
                 "ReplaceKeyPrefixWith": "latest/rc/"
             }