Skip to content

Commit d723ef4

Browse files
authored
Merge pull request DataDog#7230 from DataDog/ruth/docs-632
DOCS-632 Pull SaltStack docs
2 parents 7bca5b2 + 021d045 commit d723ef4

File tree

8 files changed

+48
-8
lines changed

8 files changed

+48
-8
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ content/en/agent/basic_agent_usage/ansible.md
1313
content/en/agent/basic_agent_usage/chef.md
1414
content/en/agent/basic_agent_usage/heroku.md
1515
content/en/agent/basic_agent_usage/puppet.md
16+
content/en/agent/basic_agent_usage/saltstack.md
1617

1718
# Tracing
1819
content/en/tracing/setup/ruby.md

.gitlab-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ build_live:
106106
variables:
107107
CONFIG: ${LIVE_CONFIG}
108108
URL: ${LIVE_DOMAIN}
109-
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"
109+
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"
110110
CONFIGURATION_FILE: "./local/bin/py/build/configurations/pull_config.yaml"
111111
LOCAL: "False"
112112
script:

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ clean-auto-doc: ##Remove all doc automatically created
9494
rm -f content/en/agent/basic_agent_usage/heroku.md ;fi
9595
@if [ content/en/agent/basic_agent_usage/puppet.md ]; then \
9696
rm -f content/en/agent/basic_agent_usage/puppet.md ;fi
97+
@if [ content/en/agent/basic_agent_usage/saltstack.md ]; then \
98+
rm -f content/en/agent/basic_agent_usage/saltstack.md ;fi
9799
@if [ content/en/tracing/setup/ruby.md ]; then \
98100
rm -f content/en/tracing/setup/ruby.md ;fi
99101
@if [ content/en/developers/amazon_cloudformation.md ]; then \

config/_default/menus/menus.en.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,11 @@ main:
189189
url: "agent/basic_agent_usage/redhat/"
190190
weight: 111
191191
parent: "basic_agent_usage"
192-
# SALT WILL GO HERE
192+
- name: "SaltStack"
193+
identifier: "basic_agent_usage_saltstack"
194+
url: "agent/basic_agent_usage/saltstack/"
195+
weight: 112
196+
parent: "basic_agent_usage"
193197
- name: "SUSE"
194198
identifier: "basic_agent_usage_suse"
195199
url: "agent/basic_agent_usage/suse/"

data/partials/platforms.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@ platforms:
2626
- name: heroku
2727
link: "agent/basic_agent_usage/heroku/"
2828
image: "platform_heroku.png"
29-
- name: puppet
30-
link: "agent/basic_agent_usage/puppet/"
31-
image: "platform_puppet.png"
3229
- name: kubernetes
3330
link: "agent/kubernetes/"
3431
image: "platform_kubernetes.png"
35-
- name: osx
36-
link: "agent/basic_agent_usage/osx/"
37-
image: "platform_macosx.png"
32+
- name: puppet
33+
link: "agent/basic_agent_usage/puppet/"
34+
image: "platform_puppet.png"
3835
- name: redhat
3936
link: "agent/basic_agent_usage/redhat/"
4037
image: "platform_redhat.png"
38+
- name: salt
39+
link: "agent/basic_agent_usage/saltstack/"
40+
image: "platform_saltstack.png"
4141
- name: suse
4242
link: "agent/basic_agent_usage/suse/"
4343
image: "platform_suse.png"
@@ -102,6 +102,9 @@ gs:
102102
- name: ansible
103103
link: "https://app.datadoghq.com/account/settings#agent/ansible"
104104
image: "platform_ansible.png"
105+
- name: salt
106+
link: "https://app.datadoghq.com/account/settings#agent/saltstack"
107+
image: "platform_saltstack.png"
105108
- name: cloud_foundry
106109
link: "https://app.datadoghq.com/account/settings#agent/cloud_foundry"
107110
image: "platform_cloud_foundry.png"

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

+15
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@
135135
kind: documentation
136136
dependencies: ["https://github.com/DataDog/puppet-datadog-agent/blob/master/README.md"]
137137

138+
- repo_name: datadog-formula # SaltStack
139+
contents:
140+
141+
- action: pull-and-push-file
142+
branch: master
143+
globs:
144+
- README.md
145+
options:
146+
dest_path: '/agent/basic_agent_usage/'
147+
file_name: 'saltstack.md'
148+
front_matters:
149+
title: SaltStack
150+
kind: documentation
151+
dependencies: ["https://github.com/DataDog/datadog-formula/blob/master/README.md"]
152+
138153
- repo_name: dd-trace-rb
139154
contents:
140155
- action: pull-and-push-file

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

+15
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@
135135
kind: documentation
136136
dependencies: ["https://github.com/DataDog/puppet-datadog-agent/blob/master/README.md"]
137137

138+
- repo_name: datadog-formula
139+
contents:
140+
141+
- action: pull-and-push-file
142+
branch: ruth/docs-632
143+
globs:
144+
- README.md
145+
options:
146+
dest_path: '/agent/basic_agent_usage/'
147+
file_name: 'saltstack.md'
148+
front_matters:
149+
title: SaltStack
150+
kind: documentation
151+
dependencies: ["https://github.com/DataDog/datadog-formula/blob/master/README.md"]
152+
138153
- repo_name: dd-trace-rb
139154
contents:
140155
- action: pull-and-push-file
6.08 KB
Loading

0 commit comments

Comments
 (0)