update with master content resolving merge conflicts

content/en/docs/tasks/debug-application-cluster/audit.md

@@ -345,8 +345,8 @@ Fluent-plugin-forest and fluent-plugin-rewrite-tag-filter are plugins for fluent
 
 1. create a config file for fluentd
 
-    ```none
-    $ cat <<'EOF' > /etc/fluentd/config
+    ```
+    cat <<'EOF' > /etc/fluentd/config
     # fluentd conf runs in the same host with kube-apiserver
     <source>
         @type tail
@@ -401,7 +401,7 @@ Fluent-plugin-forest and fluent-plugin-rewrite-tag-filter are plugins for fluent
 1. start fluentd
 
     ```shell
-    $ fluentd -c /etc/fluentd/config  -vv
+    fluentd -c /etc/fluentd/config  -vv
     ```
 
 1. start kube-apiserver with the following options:
@@ -419,10 +419,11 @@ we will use logstash to collect audit events from webhook backend, and save even
 different users into different files.
 
 1. install [logstash][logstash_install_doc]
+
 1. create config file for logstash
 
-    ```none
-    $ cat <<EOF > /etc/logstash/config
+    ```
+    cat <<EOF > /etc/logstash/config
     input{
         http{
             #TODO, figure out a way to use kubeconfig file to authenticate to logstash
@@ -454,13 +455,14 @@ different users into different files.
 1. start logstash
 
     ```shell
-    $ bin/logstash -f /etc/logstash/config --path.settings /etc/logstash/
+    bin/logstash -f /etc/logstash/config --path.settings /etc/logstash/
     ```
 
 1. create a [kubeconfig file](/docs/tasks/access-application-cluster/authenticate-across-clusters-kubeconfig/) for kube-apiserver webhook audit backend
 
-        $ cat <<EOF > /etc/kubernetes/audit-webhook-kubeconfig
+        cat <<EOF > /etc/kubernetes/audit-webhook-kubeconfig
         apiVersion: v1
+        kind: Config
         clusters:
         - cluster:
             server: http://<ip_of_logstash>:8888
@@ -471,7 +473,6 @@ different users into different files.
             user: ""
           name: default-context
         current-context: default-context
-        kind: Config
         preferences: {}
         users: []
         EOF

content/en/docs/tasks/debug-application-cluster/debug-service.md

@@ -48,10 +48,10 @@ OUTPUT
 ## Running commands in a Pod
 
 For many steps here you will want to see what a `Pod` running in the cluster
-sees.  The simplest way to do this is to run an interactive busybox `Pod`:
+sees.  The simplest way to do this is to run an interactive alpine `Pod`:
 
 ```none
-kubectl run -it --rm --restart=Never busybox --image=busybox sh
+kubectl run -it --rm --restart=Never alpine --image=alpine sh
 / #
 ```
 {{< note >}}
@@ -219,7 +219,7 @@ own cluster.
 You can also try this from a `Node` in the cluster:
 
 {{< note >}}
-10.0.0.10 is my DNS `Service`, yours might be different).
+10.0.0.10 is my DNS `Service`, yours might be different.
 {{< /note >}}
 
 ```shell

content/en/docs/tasks/debug-application-cluster/monitor-node-health.md

@@ -44,7 +44,7 @@ it to [support other log format](/docs/tasks/debug-application-cluster/monitor-n
 
 ## Enable/Disable in GCE cluster
 
-Node problem detector is [running as a cluster addon](/docs/setup/cluster-large/#addon-resources) enabled by default in the
+Node problem detector is [running as a cluster addon](/docs/setup/best-practices/cluster-large/#addon-resources) enabled by default in the
 gce cluster.
 
 You can enable/disable it by setting the environment variable

content/en/docs/tasks/debug-application-cluster/resource-usage-monitoring.md

@@ -75,6 +75,14 @@ Prometheus provides a robust query language and a built-in dashboard for
 querying and visualizing your data. Prometheus is also a supported
 data source for [Grafana](https://prometheus.io/docs/visualization/grafana/).
 
+### Sysdig
+[Sysdig](http://sysdig.com) provides full spectrum container and platform intelligence, and is a
+true container native solution. Sysdig pulls together data from system calls, Kubernetes events,
+Prometheus metrics, statsD, JMX, and more into a single pane that gives you a comprehensive picture 
+of your environment. Sysdig also provides an API to query for providing robust and customizable 
+solutions. Sysdig is built on Open Source. [Sysdig and Sysdig Inspect](https://sysdig.com/opensource/inspect/) give you the 
+ability to freely perform troubleshooting, performance analyis and forensics. 
+
 ### Google Cloud Monitoring
 
 Google Cloud Monitoring is a hosted monitoring service you can use to

content/en/docs/tasks/debug-application-cluster/troubleshooting.md

@@ -70,6 +70,7 @@ There are also many country specific/local language channels. Feel free to join
 these channels for localized support and info:
 
 - China: `#cn-users`, `#cn-events`
+- Finland: `#fi-users`
 - France: `#fr-users`, `#fr-events`
 - Germany: `#de-users`, `#de-events`
 - India: `#in-users`, `#in-events`
@@ -81,6 +82,7 @@ these channels for localized support and info:
 - Poland: `#pl-users`
 - Russia: `#ru-users`
 - Spain: `#es-users`
+- Sweden: `#se-users`
 - Turkey: `#tr-users`, `#tr-events`
 
 ### Forum
@@ -90,7 +92,7 @@ The Kubernetes Official Forum [discuss.kubernetes.io](https://discuss.kubernetes
 ### Bugs and Feature requests
 
 If you have what looks like a bug, or you would like to make a feature request,
-please use the [Github issue tracking system](https://github.com/kubernetes/kubernetes/issues).
+please use the [GitHub issue tracking system](https://github.com/kubernetes/kubernetes/issues).
 
 Before you file an issue, please search existing issues to see if your issue is
 already covered.