Merge branch 'master' into eliza/update-deps (#250)

* README update to 2018 (#233)

Signed-off-by: Andrew Seigner <siggy@buoyant.io>

* Prepare for v0.2.0 release (#248)

* prepare for v0.2.0 release

Signed-off-by: Dennis Adjei-Baah <dennis@buoyant.io>

* Use dots reporter instead of nyan reporter in CI (#238)

Signed-off-by: Risha Mars <mars@buoyant.io>

* Various small UI tweaks (#234)

* Various small UI naming tweaks

- align top two tables in the service mesh page
- "All Deployments" -> "Deployments"
- reorder latency p50, p95, p99
- "Current success" -> "Success rate"

* Add margin to incomplete mesh message, reorder latency in TabbedMetricsTable
* Right align numbers in service mesh page

.travis.yml

@@ -57,7 +57,7 @@ jobs:
       install:
         - cd web/app && yarn && yarn webpack
       script:
-        - yarn karma start --single-run
+        - yarn karma start --single-run --reporters dots
 
     - language: generic
       script:

CHANGES.md

@@ -1,3 +1,31 @@
+## v0.2.0
+
+This is a big milestone! With this release, Conduit adds support for HTTP/1.x and raw TCP traffic,
+meaning it should "just work" for most applications that are running on Kubernetes without
+additional configuration.
+
+* Data plane
+  * Conduit now transparently proxies all TCP traffic, including HTTP/1.x and HTTP/2.
+    (See caveats below.)
+* Command-line interface
+  * Improved error handling for the `tap` command
+  * `tap` also now works with HTTP/1.x traffic
+* Dashboard
+  * Minor UI appearance tweaks
+  * Deployments now searchable from the dashboard sidebar
+
+Caveats:
+* Conduit will automatically work for most protocols. However, applications that use WebSockets,
+  HTTP tunneling/proxying, or protocols such as MySQL and SMTP, will require some additional
+  configuration. See the [documentation](https://conduit.io/adding-your-service/#protocol-support)
+  for details.
+* Conduit doesn't yet support external DNS lookups. These will be addressed in an upcoming release.
+* There are known issues with Conduit's telemetry pipeline that prevent it from scaling beyond a
+  few nodes. These will be addressed in an upcoming release.
+* Conduit is still in alpha! Please help us by
+  [filing issues and contributing pull requests](https://github.com/runconduit/conduit/issues/new).
+
+
 ## v0.1.3
 
 * This is a minor bugfix for some web dashboard UI elements that were not rendering correctly.
@@ -30,7 +58,7 @@ Conduit 0.1.1 is focused on making it easier to get started with Conduit.
 * The `conduit tap` command output has been reformatted to be line-oriented, making it easier to
   parse with common UNIX command line utilities.
 * Conduit now supports routing of non-fully qualified domain names.
-* The web UI has improved support for large deployments and deployments that don’t have any
+* The web UI has improved support for large deployments and deployments that don't have any
   inbound/outbound traffic.
 
 ## v0.1.0

README.md

@@ -55,7 +55,7 @@ minutes to review our [code of conduct][coc].
 
 ## License
 
-Copyright 2017, Buoyant Inc. All rights reserved.
+Copyright 2018, Buoyant Inc. All rights reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use
 these files except in compliance with the License. You may obtain a copy of the

futures-mpsc-lossy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "futures-mpsc-lossy"
-version = "0.1.3"
+version = "0.2.0"
 authors = ["Oliver Gould <ver@buoyant.io>"]
 publish = false
 

proxy/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "conduit-proxy"
-version = "0.1.3"
+version = "0.2.0"
 authors = ["Oliver Gould <ver@buoyant.io>"]
 publish = false
 

proxy/Dockerfile

@@ -5,7 +5,7 @@
 ## Build the rust proxy into a binary.
 #
 # If the RELEASE arg is set and non-empty, a release artifact is built.
-FROM gcr.io/runconduit/proxy-deps:423ffcd1 as build
+FROM gcr.io/runconduit/proxy-deps:fb72d14b as build
 WORKDIR /usr/src/conduit
 # Ranked roughly from least to most likely to change. Cargo.lock is the least likely
 # because it is supposed to be cached in the deps base image.

tower-router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tower-router"
-version = "0.1.3"
+version = "0.2.0"
 authors = ["Carl Lerche <me@carllerche.com>"]
 publish = false
 

web/app/css/service-mesh.css

@@ -8,14 +8,16 @@
   }
   & .metric {
     float: right;
+    text-align: right;
   }
 }
 
 .mesh-section .metric-large {
   width: 131px;
 }
 
-.incomplete-mesh-message, .complete-mesh-message {
+.mesh-completion-message {
+  margin-top: calc(4 * var(--base-width));
   background-color: var(--royalblue);
   color: white;
   padding: var(--base-width);
@@ -25,6 +27,10 @@
   border-radius: var
 }
 
+.service-mesh-table {
+  margin-top: 18px;
+}
+
 /* styles for the StatusTable */
 td .status-dot {
   float: left;

web/app/js/components/DeploymentSummary.jsx

@@ -26,12 +26,12 @@ export default class DeploymentSummary extends React.Component {
             flashLastDatapoint={true} />
 
           <div className="summary-stat">
-            <div className="metric-title">Current requests</div>
+            <div className="metric-title">Request rate</div>
             <div className="metric-value">{metricToFormatter["REQUEST_RATE"](this.props.data.requestRate)}</div>
           </div>
 
           <div className="summary-stat">
-            <div className="metric-title">Current success</div>
+            <div className="metric-title">Success rate</div>
             <div className="metric-value">{metricToFormatter["SUCCESS_RATE"](this.props.data.successRate)}</div>
           </div>
         </div>

web/app/js/components/DeploymentsList.jsx

@@ -214,7 +214,7 @@ export default class DeploymentsList extends React.Component {
         { !this.state.loaded ? <ConduitSpinner />  :
           <div>
             <div className="page-header">
-              <h1>All deployments</h1>
+              <h1>Deployments</h1>
             </div>
             { _.isEmpty(this.state.metrics) ?
               <CallToAction numDeployments={_.size(this.state.metrics)} /> :

web/app/js/components/LatencyOverview.jsx

@@ -160,7 +160,7 @@ export default class MultiLineGraph extends React.Component {
     return (
       <div className="current-latency">
         {
-          _.map(["P99", "P95", "P50"], latency => {
+          _.map(["P50", "P95", "P99"], latency => {
             let ts = this.props.data[latency];
             let lat = metricToFormatter["LATENCY"](_.get(_.last(ts), 'value', []));
             return (

web/app/js/components/ResourceMetricsOverview.jsx

@@ -12,14 +12,14 @@ export default class ResourceMetricsOverview extends React.Component {
         <Row gutter={rowGutter}>
           <Col span={8}>
             <ResourceOverviewMetric
-              name="Current request rate"
+              name="Request rate"
               metric="REQUEST_RATE"
               lastUpdated={this.props.lastUpdated}
               timeseries={_.get(this.props.timeseries, "REQUEST_RATE", [])} />
           </Col>
           <Col span={8}>
             <ResourceOverviewMetric
-              name="Current success rate"
+              name="Success rate"
               metric="SUCCESS_RATE"
               lastUpdated={this.props.lastUpdated}
               timeseries={_.get(this.props.timeseries, "SUCCESS_RATE", [])} />

web/app/js/components/ServiceMesh.jsx

@@ -267,27 +267,27 @@ export default class ServiceMesh extends React.Component {
   renderAddDeploymentsMessage() {
     if (this.deployCount() === 0) {
       return (
-        <div className="incomplete-mesh-message">
+        <div className="mesh-completion-message">
           No deployments detected. {incompleteMeshMessage()}
         </div>
       );
     } else {
       switch (this.unaddedDeploymentCount()) {
       case 0:
         return (
-          <div className="complete-mesh-message">
+          <div className="mesh-completion-message">
             All deployments have been added to the service mesh.
           </div>
         );
       case 1:
         return (
-          <div className="incomplete-mesh-message">
+          <div className="mesh-completion-message">
             1 deployment has not been added to the service mesh. {incompleteMeshMessage()}
           </div>
         );
       default:
         return (
-          <div className="incomplete-mesh-message">
+          <div className="mesh-completion-message">
             {this.unaddedDeploymentCount()} deployments have not been added to the service mesh. {incompleteMeshMessage()}
           </div>
         );

web/app/js/components/TabbedMetricsTable.jsx

@@ -99,9 +99,9 @@ const metricToColumns = baseCols => {
     successRate: (resource, pathPrefix) => [baseCols.resourceName(resource, pathPrefix), baseCols.successRate],
     latency: (resource, pathPrefix) => [
       baseCols.resourceName(resource, pathPrefix),
-      baseCols.latencyP99,
+      baseCols.latencyP50,
       baseCols.latencyP95,
-      baseCols.latencyP50
+      baseCols.latencyP99
     ]
   };
 };