Merge pull request #464 from ExpediaDotCom/co-branding-zipkin

Co branding zipkin
ExpediaDotCom · Feb 4, 2019 · 4bbd514 · 4bbd514
2 parents 77013e5 + dedeef0
commit 4bbd514
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 2 deletions.
diff --git a/public/images/zipkin-logo.jpg b/public/images/zipkin-logo.jpg
diff --git a/server/routes/index.js b/server/routes/index.js
@@ -49,7 +49,8 @@ router.get('*', (req, res) => {
         tracesTTL: config.connectors.traces.ttl,
         trendsTTL: config.connectors.trends && config.connectors.trends.ttl,
         relatedTracesOptions: config.relatedTracesOptions,
-        tagValuesTransformMap: config.tagValuesTransformMap
+        tagValuesTransformMap: config.tagValuesTransformMap,
+        usingZipkinConnector: (config.connectors.traces.connectorName === 'zipkin')
     });
 
     onFinished(res, () => {

diff --git a/server/views/index.pug b/server/views/index.pug
@@ -29,7 +29,8 @@ html
             tracesTTL: !{JSON.stringify(tracesTTL || -1)},
             trendsTTL: !{JSON.stringify(trendsTTL || -1)},
             relatedTracesOptions: !{JSON.stringify(relatedTracesOptions || [])},
-            tagValuesTransformMap: !{JSON.stringify(tagValuesTransformMap || {})}
+            tagValuesTransformMap: !{JSON.stringify(tagValuesTransformMap || {})},
+            usingZipkinConnector: !{JSON.stringify(usingZipkinConnector || false)},
         }
     script(async, defer, src = bundleCommonsJsPath)
     script(async, defer, src = bundleAppJsPath)
diff --git a/src/bootstrap/variables.less b/src/bootstrap/variables.less
@@ -66,6 +66,7 @@
 @font-size-h4:            24px;
 @font-size-h5:            20px;
 @font-size-h6:            14px;
+@font-size-h7:            10px;
 
 //** Unit-less `line-height` for use in components like buttons.
 @line-height-base:        1.846; // 20/14

diff --git a/src/components/layout/slimHeader.jsx b/src/components/layout/slimHeader.jsx
@@ -25,6 +25,12 @@ export default () => (
                 <img src="/images/logo-white.png" className="logo universal-search-header__logo" alt="Logo"/>
                 <span className="usb-logo universal-search-header__title">Haystack</span>
             </Link>
+          { window.haystackUiConfig.usingZipkinConnector ?
+            <Link className="usb-logo navbar-brand universal-search-header__container" to="/">
+              <span className="universal-search-header__subtitle">Tracing powered by</span>
+              <img src="/images/zipkin-logo.jpg" className="logo universal-search-header__logo" alt="Logo"/>
+              <span className="usb-logo universal-search-header__title">Zipkin</span>
+            </Link> : window.haystackUiConfig.usingZipkinConnector }
         </div>
     </header>
 );
diff --git a/src/components/universalSearch/universalSearch.less b/src/components/universalSearch/universalSearch.less
@@ -26,6 +26,12 @@
 
 .universal-search-header__title {
     font-size: @font-size-h5;
+    padding: @padding-xs-horizontal;
+}
+
+.universal-search-header__subtitle{
+    font-size: @font-size-h7;
+    padding: @padding-xs-horizontal;
 }
 
 .universal-search-header__container {