website: update cli output content

website/source/configuration.html.erb

@@ -11,13 +11,13 @@ description: |-
     <h1>Service configuration made easy</h1>
     <p>Feature rich key/value store to easily configure services</p>
     <div>
-      <a href="#" class="g-btn download">
+      <a href="/downloads.html" class="g-btn download">
         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22">
           <path d="M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z"/>
         </svg>
         Download
       </a>
-      <a href="#" class="g-btn dark-outline">Explore Docs</a>
+      <a href="/intro/getting-started/kv.html" class="g-btn dark-outline">Explore Docs</a>
     </div>
   </section>
 
@@ -92,17 +92,27 @@ description: |-
         <div class='code-sample'>
           <div>
             <span></span>
-            <div class="code">
+            <div class='code'>
-              <code>$ curl \
+              <code>$ curl <code class='keyword'>http://localhost:8500/v1/txn \</code>
-  --request POST \
+  --request PUT \
   --data \
-'{
+  '[
-  "Name": "api",
+    {
-  "Service": {
+      "KV": {
-    "Service": "api",
+        "Verb": "set",
-    </code><code class='keyword'>"Tags"</code><code>: ["v1.2.3"],
+        "Key": "lock",
-    "Failover": {
+        "Value": "MQ=="
-      "Datacenters": ["dc1", "dc2"]</code>
+      }
+    },
+    {
+      "KV": {
+        "Verb": "cas",
+        "Index": 10,
+        "Key": "configuration",
+        "Value": "c29tZS1jb25maWc="
+      }
+    }
+  ]'</code>
             </div>
           </div>
         </div>
@@ -126,16 +136,17 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code class='keyword'>$ curl \</code><code>
+              <code>$ curl <code class="keyword">http://localhost:8500/v1/kv/web/config/rate_limit?wait=1m&index=229</code>
-  --request POST \
+[
-  --data \
+    {
-'{
+        "LockIndex": 0,
-  "Name": "api",
+        "Key": "web/config/rate_limit",
-  "Service": {
+        "Flags": 0,
-    "Service": "api",
+        "Value": "NjAw",
-    "Tags": ["v1.2.3"],
+        "CreateIndex": 229,
-    "Failover": {
+        "ModifyIndex": 234
-      "Datacenters": ["dc1", "dc2"]</code>
+    }
+]</code>
             </div>
           </div>
         </div>
@@ -159,16 +170,11 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code class='keyword'>$ curl \</code><code>
+              <code>$ consul watch \
-  --request POST \
+      -type=key \
-  --data \
+      -key=web/config/rate_limit \
-'{
+      <code class="keyword">/usr/local/bin/record-rate-limit.sh</code>
-  "Name": "api",
+              </code>
-  "Service": {
-    "Service": "api",
-    "Tags": ["v1.2.3"],
-    "Failover": {
-      "Datacenters": ["dc1", "dc2"]</code>
             </div>
           </div>
         </div>
@@ -242,13 +248,13 @@ description: |-
   <section class='g-section g-cta-section'>
     <div>
       <h2>Ready to get started?</h2>
-      <a href="#" class="g-btn white download">
+      <a href="/downloads.html" class="g-btn white download">
         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22">
           <path d="M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z"/>
         </svg>
         Download
       </a>
-      <a href="#" class="g-btn white-outline">Explore docs</a>
+      <a href="/intro/getting-started/kv.html" class="g-btn white-outline">Explore docs</a>
     </div>
   </section>
 

website/source/discovery.html.erb

@@ -12,13 +12,13 @@ description: |-
     <p>Service registry, integrated health checks, and DNS and HTTP interfaces
       enable any service to discover and be discovered by other services</p>
     <div>
-      <a href="#" class="g-btn download">
+      <a href="/downloads.html" class="g-btn download">
         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22">
           <path d="M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z"/>
         </svg>
         Download
       </a>
-      <a href="#" class="g-btn dark-outline">Explore Docs</a>
+      <a href="/intro/getting-started/services.html" class="g-btn dark-outline">Explore Docs</a>
     </div>
   </section>
 
@@ -90,17 +90,21 @@ description: |-
         <div class='code-sample'>
           <div>
             <span></span>
-            <div class='code'>
+            <div class='code'><code>
-              <code class='keyword'>$ curl \</code><code>
+$ dig <code class='keyword'>web-frontend.service.consul.</code> ANY
-  --request POST \
+
-  --data \
+; <<>> DiG 9.8.3-P1 <<>> web-frontend.service.consul. ANY
-'{
+;; global options: +cmd
-  "Name": "api",
+;; Got answer:
-  "Service": {
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 29981
-    "Service": "api",
+;; flags: qr aa rd ra; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 0
-    "Tags": ["v1.2.3"],
+
-    "Failover": {
+;; QUESTION SECTION:
-      "Datacenters": ["dc1", "dc2"]</code>
+;web-frontend.service.consul. IN ANY
+
+;; ANSWER SECTION:
+web-frontend.service.consul. 0 IN A <code class='keyword'>10.0.3.83</code>
+web-frontend.service.consul. 0 IN A <code class='keyword'>10.0.1.109</code></code>
             </div>
           </div>
         </div>
@@ -124,16 +128,20 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code class='keyword'>$ curl \</code><code>
+              <code>$ curl <code class='keyword'>http://localhost:8500/v1/health/service/web?index=11&wait=30s</code>
-  --request POST \
+{
-  --data \
+  ...
-'{
+  "Node": "10-0-1-109",
-  "Name": "api",
+  "CheckID": "service:web",
-  "Service": {
+  "Name": "Service 'web' check",
-    "Service": "api",
+  "Status": <code class='keyword'>"critical"</code>,
-    "Tags": ["v1.2.3"],
+  "ServiceID": "web",
-    "Failover": {
+  "ServiceName": "web",
-      "Datacenters": ["dc1", "dc2"]</code>
+  "CreateIndex": 10,
+  "ModifyIndex": 20
+  ...
+}
+</code>
             </div>
           </div>
         </div>
@@ -157,16 +165,10 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code class='keyword'>$ curl \</code><code>
+              <code>$ curl http://localhost:8500/v1/catalog/datacenters
-  --request POST \
+<code class='keyword'>["dc1", "dc2"]</code>
-  --data \
+$ curl http://localhost:8500/v1/catalog/nodes?<code class='keyword'>dc=dc2</code>
-'{
+...</code>
-  "Name": "api",
-  "Service": {
-    "Service": "api",
-    "Tags": ["v1.2.3"],
-    "Failover": {
-      "Datacenters": ["dc1", "dc2"]</code>
             </div>
           </div>
         </div>

website/source/index.html.erb

@@ -11,20 +11,20 @@ description: |-
       <div>
         <div>
           <div>
-            <a class='notification' href='#'>
+            <a class='notification' href='https://www.hashicorp.com/blog/consul-1-2-service-mesh'>
-              <span>New</span> Consul 1.0 release. Get the details <svg xmlns='http://www.w3.org/2000/svg' width='6' height='10' viewBox='0 0 6 10'><path fill='#650D34' d='M1.138.529a.666.666 0 1 0-.942.943L3.724 5 .195 8.53a.666.666 0 1 0 .943.943l4-4a.666.666 0 0 0 0-.943l-4-4z'/></svg>
+              <span>New</span> HashiCorp Consul 1.2: Service Mesh. Read the blog post <svg xmlns='http://www.w3.org/2000/svg' width='6' height='10' viewBox='0 0 6 10'><path fill='#650D34' d='M1.138.529a.666.666 0 1 0-.942.943L3.724 5 .195 8.53a.666.666 0 1 0 .943.943l4-4a.666.666 0 0 0 0-.943l-4-4z'/></svg>
             </a>
             <h1>Service Mesh Made Easy</h1>
             <p>Consul is a distributed service mesh to connect, secure, and configure services across any runtime platform and public or private cloud</p>
-            <a href='#' class='g-btn download'>
+            <a href='/downloads.html' class='g-btn download'>
               <svg xmlns='http://www.w3.org/2000/svg' width='20' height='22' viewBox='0 0 20 22'>
                 <path d='M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z'/>
               </svg>
               Download
             </a>
-            <a href='#' class='g-btn dark-outline'>Get Started</a>
+            <a href='/intro/getting-started/install.html' class='g-btn dark-outline'>Get Started</a>
             <div>
-              <a href='#' class='secondary-link'>View demo of web UI</a>
+              <a href='https://demo.consul.io/' class='secondary-link'>View demo of web UI</a>
             </div>
           </div>
         </div>
@@ -160,16 +160,18 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code>$ curl \
+              <code>$ curl <code class='keyword'>http://localhost:8500/v1/kv/deployment</code>
-  --request POST \
+[
-  --data \
+  {
-'{
+    "LockIndex": 1,
-  "Name": "api",
+    "Session": "1c3f5836-4df4-0e26-6697-90dcce78acd9",
-  "Service": {
+    "Value": "Zm9v",
-    "Service": "api",
+    "Flags": 0,
-    </code><code class='keyword'>"Tags"</code><code>: ["v1.2.3"],
+    "Key": "deployment",
-    "Failover": {
+    "CreateIndex": 13,
-      "Datacenters": ["dc1", "dc2"]</code>
+    "ModifyIndex": 19
+  }
+]</code>
             </div>
           </div>
         </div>
@@ -249,7 +251,7 @@ description: |-
         </div>
         <p>Consul Open Source addresses the technical complexity of connecting services across distributed infrastructure.</p>
         <div>
-          <a href='#' class='g-btn white download'>
+          <a href='/downloads.html' class='g-btn white download'>
             <svg xmlns='http://www.w3.org/2000/svg' width='20' height='22' viewBox='0 0 20 22'>
               <path d='M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z'/>
             </svg>

website/source/segmentation.html.erb

@@ -12,13 +12,13 @@ description: |-
     <h1>Service segmentation made easy</h1>
     <p>Secure service-to-service communication with automatic TLS encryption and identity-based authorization</p>
     <div>
-      <a href="#" class="g-btn download">
+      <a href="/downloads.html" class="g-btn download">
         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22">
           <path d="M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z"/>
         </svg>
         Download
       </a>
-      <a href="#" class="g-btn dark-outline">Explore Docs</a>
+      <a href="/docs/connect/index.html" class="g-btn dark-outline">Explore Docs</a>
     </div>
   </section>
 
@@ -99,17 +99,19 @@ description: |-
         <div class='code-sample'>
           <div>
             <span></span>
-            <div class='code'>
+            <div class='code'><code>$ <code class="keyword">consul connect proxy</code> \
-              <code class='keyword'>$ curl \</code><code>
+      -service web \
-  --request POST \
+      -service-addr 127.0.0.1:80 \
-  --data \
+      -listen 10.0.1.109:7200
-'{
+==> Consul Connect proxy starting...
-  "Name": "api",
+    Configuration mode: Flags
-  "Service": {
+                Service: web
-    "Service": "api",
+        Public listener: <code class="keyword">10.0.1.109:7200 => 127.0.0.1:80</code>
-    "Tags": ["v1.2.3"],
+
-    "Failover": {
+==> Log data will now stream in as it occurs:
-      "Datacenters": ["dc1", "dc2"]</code>
+
+    2018/06/23 09:33:51 [INFO] public listener starting on 10.0.1.109:7200
+    2018/06/23 09:33:51 [INFO] proxy loaded config and ready to serve</code>
             </div>
           </div>
         </div>
@@ -155,16 +157,7 @@ description: |-
           <div>
             <span></span>
             <div class='code'>
-              <code class='keyword'>$ curl \</code><code>
+              <code class='keyword'>TODO</code>
-  --request POST \
-  --data \
-'{
-  "Name": "api",
-  "Service": {
-    "Service": "api",
-    "Tags": ["v1.2.3"],
-    "Failover": {
-      "Datacenters": ["dc1", "dc2"]</code>
             </div>
           </div>
         </div>
@@ -175,13 +168,13 @@ description: |-
   <section class='g-section g-cta-section'>
     <div>
       <h2>Ready to get started?</h2>
-      <a href="#" class="g-btn white download">
+      <a href="/intro/getting-started/connect.html" class="g-btn white download">
         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="22" viewBox="0 0 20 22">
           <path d="M9.292 15.706a1 1 0 0 0 1.416 0l3.999-3.999a1 1 0 1 0-1.414-1.414L11 12.586V1a1 1 0 1 0-2 0v11.586l-2.293-2.293a1 1 0 1 0-1.414 1.414l3.999 3.999zM20 16v3c0 1.654-1.346 3-3 3H3c-1.654 0-3-1.346-3-3v-3a1 1 0 1 1 2 0v3c0 .551.448 1 1 1h14c.552 0 1-.449 1-1v-3a1 1 0 1 1 2 0z"/>
       </svg>
         Download
       </a>
-      <a href="#" class="g-btn white-outline">Explore docs</a>
+      <a href="/docs/connect/index.html" class="g-btn white-outline">Explore docs</a>
     </div>
   </section>