Merge pull request DataDog#7325 from DataDog/revert-7230-ruth/docs-632

Revert "DOCS-632 Pull SaltStack docs"

Author: Pierre Guceski

.gitignore

@@ -13,7 +13,6 @@ content/en/agent/basic_agent_usage/ansible.md
 content/en/agent/basic_agent_usage/chef.md
 content/en/agent/basic_agent_usage/heroku.md
 content/en/agent/basic_agent_usage/puppet.md
-content/en/agent/basic_agent_usage/saltstack.md
 
 # Tracing
 content/en/tracing/setup/ruby.md

.gitlab-ci.yml

@@ -106,7 +106,7 @@ build_live:
   variables:
     CONFIG: ${LIVE_CONFIG}
     URL: ${LIVE_DOMAIN}
-    UNTRACKED_EXTRAS: "data,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/agent/basic_agent_usage/saltstack.md,content/en/developers/integrations,content/en/developers/amazon_cloudformation.md,content/en/integrations,content/en/logs/log_collection/android.md,content/en/logs/log_collection/ios.md,content/en/tracing/setup/android.md,content/en/tracing/setup/ruby.md"
+    UNTRACKED_EXTRAS: "data,content/en/agent/basic_agent_usage/heroku.md,content/en/agent/basic_agent_usage/ansible.md,content/en/agent/basic_agent_usage/chef.md,content/en/agent/basic_agent_usage/puppet.md,content/en/developers/integrations,content/en/developers/amazon_cloudformation.md,content/en/integrations,content/en/logs/log_collection/android.md,content/en/logs/log_collection/ios.md,content/en/tracing/setup/android.md,content/en/tracing/setup/ruby.md"
     CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config.yaml"
     LOCAL: "False"
   script:

Makefile

@@ -94,8 +94,6 @@ clean-auto-doc: ##Remove all doc automatically created
 	rm -f content/en/agent/basic_agent_usage/heroku.md ;fi
 	@if [ content/en/agent/basic_agent_usage/puppet.md ]; then \
 	rm -f content/en/agent/basic_agent_usage/puppet.md ;fi
-	@if [ content/en/agent/basic_agent_usage/saltstack.md ]; then \
-	rm -f content/en/agent/basic_agent_usage/saltstack.md ;fi
 	@if [ content/en/tracing/setup/ruby.md ]; then \
 	rm -f content/en/tracing/setup/ruby.md ;fi
 	@if [ content/en/developers/amazon_cloudformation.md ]; then \

config/_default/menus/menus.en.yaml

@@ -189,11 +189,7 @@ main:
     url: "agent/basic_agent_usage/redhat/"
     weight: 111
     parent: "basic_agent_usage"
-  - name: "SaltStack"
-    identifier: "basic_agent_usage_saltstack"
-    url: "agent/basic_agent_usage/saltstack/"
-    weight: 112
-    parent: "basic_agent_usage"
+  # SALT WILL GO HERE
   - name: "SUSE"
     identifier: "basic_agent_usage_suse"
     url: "agent/basic_agent_usage/suse/"

data/partials/platforms.yaml

@@ -26,18 +26,18 @@ platforms:
   - name: heroku
     link: "agent/basic_agent_usage/heroku/"
     image: "platform_heroku.png"
-  - name: kubernetes
-    link: "agent/kubernetes/"
-    image: "platform_kubernetes.png"
   - name: puppet
     link: "agent/basic_agent_usage/puppet/"
     image: "platform_puppet.png"
+  - name: kubernetes
+    link: "agent/kubernetes/"
+    image: "platform_kubernetes.png"
+  - name: osx
+    link: "agent/basic_agent_usage/osx/"
+    image: "platform_macosx.png"
   - name: redhat
     link: "agent/basic_agent_usage/redhat/"
     image: "platform_redhat.png"
-  - name: salt
-    link: "agent/basic_agent_usage/saltstack/"
-    image: "platform_saltstack.png"
   - name: suse
     link: "agent/basic_agent_usage/suse/"
     image: "platform_suse.png"
@@ -102,9 +102,6 @@ gs:
   - name: ansible
     link: "https://app.datadoghq.com/account/settings#agent/ansible"
     image: "platform_ansible.png"
-  - name: salt
-    link: "https://app.datadoghq.com/account/settings#agent/saltstack"
-    image: "platform_saltstack.png"
   - name: cloud_foundry
     link: "https://app.datadoghq.com/account/settings#agent/cloud_foundry"
     image: "platform_cloud_foundry.png"

local/bin/py/build/configurations/pull_config.yaml

@@ -135,21 +135,6 @@
           kind: documentation
           dependencies: ["https://github.com/DataDog/puppet-datadog-agent/blob/master/README.md"]
 
-  - repo_name: datadog-formula # SaltStack
-    contents:
-
-    - action: pull-and-push-file
-      branch: master
-      globs:
-      - README.md
-      options:
-        dest_path: '/agent/basic_agent_usage/'
-        file_name: 'saltstack.md'
-        front_matters:
-          title: SaltStack
-          kind: documentation
-          dependencies: ["https://github.com/DataDog/datadog-formula/blob/master/README.md"]
-
   - repo_name: dd-trace-rb
     contents:
     - action: pull-and-push-file

local/bin/py/build/configurations/pull_config_preview.yaml

@@ -135,21 +135,6 @@
           kind: documentation
           dependencies: ["https://github.com/DataDog/puppet-datadog-agent/blob/master/README.md"]
 
-  - repo_name: datadog-formula
-    contents:
-
-    - action: pull-and-push-file
-      branch: ruth/docs-632
-      globs:
-      - README.md
-      options:
-        dest_path: '/agent/basic_agent_usage/'
-        file_name: 'saltstack.md'
-        front_matters:
-          title: SaltStack
-          kind: documentation
-          dependencies: ["https://github.com/DataDog/datadog-formula/blob/master/README.md"]
-
   - repo_name: dd-trace-rb
     contents:
     - action: pull-and-push-file