Pulling Heroku Build pack

.gitignore

@@ -25,6 +25,7 @@ content/integrations/*.md
 # Ignoring all automated content
 # Developers/integrations
 content/developers/integrations/*.md
+content/agent/basic_agent_usage/heroku.md
 
 # Generated by build script
 content/integrations/faq/list-of-api-source-attribute-value.md

Makefile

@@ -87,6 +87,8 @@ clean-integrations:  ## remove built integrations files.
 clean-auto-doc: ##remove all doc automatically created
 	@if [ -d content/developers/integrations ]; then \
 	find ./content/developers/integrations -type f -maxdepth 1 -exec rm -rf {} \; ;fi
+	@if [ content/agent/basic_agent_usage/heroku.md ]; then \
+	rm -f content/agent/basic_agent_usage/heroku.md ;fi
 
 clean-node:  ## remove node_modules.
 	@if [ -d node_modules ]; then rm -r node_modules; fi

config.yaml

@@ -224,16 +224,16 @@ languages:
           weight: 60
           parent: menu_references_agent
 
-        - identifier: customnav_agentnav_security
-          name: "Security"
-          url: "agent/security"
-          weight: 80
-          parent: menu_references_agent
-
         # Guides
         - identifier: customnav_agentnav_guides
           name: "Guides"
           url: "agent/guide/"
+          weight: 80
+          parent: menu_references_agent
+
+        - identifier: customnav_agentnav_security
+          name: "Security"
+          url: "agent/security"
           weight: 90
           parent: menu_references_agent
 
@@ -954,6 +954,13 @@ languages:
         #  weight: 90
         #  parent: menu_references_logs
 
+        # Guides
+        - identifier: customnav_logsnav_guides
+          name: "Guides"
+          url: "logs/guide/"
+          weight: 80
+          parent: menu_references_logs
+
         - identifier: customnav_loggnav_security
           name: "Security"
           url: "logs/security"
@@ -1464,6 +1471,13 @@ languages:
           weight: 60
           parent: menu_references_agent
 
+        # Guides
+        - identifier: customnav_agentnav_guides
+          name: "Guides"
+          url: "agent/guide/"
+          weight: 80
+          parent: menu_references_agent
+
         #- identifier: customnav_agentnav_faq
         #  name: "FAQ"
         #  url: "agent/faq/"
@@ -2199,6 +2213,13 @@ languages:
         #  weight: 90
         #  parent: menu_references_logs
 
+        # Guides
+        - identifier: customnav_logsnav_guides
+          name: "Guides"
+          url: "logs/guide/"
+          weight: 90
+          parent: menu_references_agent
+
         - identifier: customnav_loggnav_security
           name: "Sécurité"
           url: "logs/security"

content/agent/apm/_index.md

@@ -195,7 +195,7 @@ Primary tags appear at the top of APM pages. Use these selectors to slice the da
 {{< partial name="whats-next/whats-next.html" >}}
 
 [1]: /tracing/faq/agent-5-tracing-setup
-[2]: https://github.com/DataDog/dd-trace-py/blob/69693dc7cdaed3a2b6a855325109fa100e42e254/ddtrace/writer.py#L159
+[2]: https://github.com/DataDog/dd-trace-py
 [3]: https://app.datadoghq.com/account/settings#agent
 [4]: https://github.com/DataDog/datadog-agent/tree/master/docs/trace-agent#run-on-macos
 [5]: /developers/libraries/#community-tracing-apm-libraries

content/agent/faq/heroku-troubleshooting.md

@@ -0,0 +1,52 @@
+---
+title: Datadog-Heroku Buildpack troubleshooting
+kind: faq
+---
+
+Verify the Datadog Agent is listening by sending a custom metric: 
+
+```shell
+# From your project directory:
+heroku run bash
+
+# Once your Dyno has started and you are at the command line
+echo -n "custom_metric:60|g|#shell" >/dev/udp/localhost/8125
+```
+
+After a few moments, use the metrics explorer to verify that the metric was received.
+
+It can also be helpful to obtain Agent and Trace Agent logs from your running dyno.
+
+Download Datadog Agent logs:
+
+```shell
+heroku ps:copy /app/.apt/var/log/datadog/datadog.log --dyno=<YOUR DYNO NAME>
+```
+
+Download Datadog Trace Agent logs:
+
+```shell
+heroku ps:copy /app/.apt/var/log/datadog/datadog-apm.log --dyno=<YOUR DYNO NAME>
+```
+
+## Send a flare
+
+Generate a flare by running:
+
+```shell
+# From your project directory:
+heroku run bash
+
+# Once your Dyno has started and you are at the command line, send a flare:
+agent -c /app/.apt/etc/datadog-agent/datadog.yaml flare
+```
+
+The flare contains the environment information and Datadog Agent configuration. However, since this is a new, stand-alone dyno, the logs are sparse and may not contain full log information.
+
+Generate a more complete flare by setting your API key as an environment variable by running:
+
+```shell
+heroku ps:exec
+DD_API_KEY=<API KEY>
+agent -c /app/.apt/etc/datadog-agent/datadog.yaml flare
+```

content/agent/guide/_index.md

@@ -3,16 +3,16 @@ title: Agent Guides
 kind: guide
 ---
 
-{{< whatsnext desc="Agent 5 Guides:" >}}
-    {{< nextlink href="agent/guide/agent-5-autodiscovery" >}}Autodiscovery in Agent v5{{< /nextlink >}}
-    {{< nextlink href="agent/guide/agent-5-kubernetes-basic-agent-usage" >}}Kubernetes Basic Agent Usage in Agent v5{{< /nextlink >}}
-    {{< nextlink href="agent/guide/dogstream" >}}Dogstream{{< /nextlink >}}
-    {{< nextlink href="agent/guide/upgrade-to-agent-v6" >}}Upgrade to Datadog Agent v6{{< /nextlink >}}
-{{< /whatsnext >}}
-<br>
 {{< whatsnext desc="General Guides:" >}}
     {{< nextlink href="agent/guide/agent-commands" >}}Agent Commands{{< /nextlink >}}
     {{< nextlink href="agent/guide/agent-configuration-files" >}}Agent Configuration Files{{< /nextlink >}}
     {{< nextlink href="agent/guide/agent-log-files" >}}Agent Log Files{{< /nextlink >}}
     {{< nextlink href="agent/guide/network" >}}Network Traffic{{< /nextlink >}}
 {{< /whatsnext >}}
+<br>
+{{< whatsnext desc="Agent 5 Guides:" >}}
+    {{< nextlink href="agent/guide/agent-5-autodiscovery" >}}Autodiscovery in Agent v5{{< /nextlink >}}
+    {{< nextlink href="agent/guide/agent-5-kubernetes-basic-agent-usage" >}}Kubernetes Basic Agent Usage in Agent v5{{< /nextlink >}}
+    {{< nextlink href="agent/guide/dogstream" >}}Dogstream{{< /nextlink >}}
+    {{< nextlink href="agent/guide/upgrade-to-agent-v6" >}}Upgrade to Datadog Agent v6{{< /nextlink >}}
+{{< /whatsnext >}}

content/logs/guide/_index.md

@@ -0,0 +1,8 @@
+---
+title: Logs Guides
+kind: guide
+---
+
+{{< whatsnext desc="" >}}
+    {{< nextlink href="logs/guide/collect-heroku-logs" >}}Collect Heroku Logs{{< /nextlink >}}
+{{< /whatsnext >}}