diff --git a/public/app/features/plugins/partials/ds_edit.html b/public/app/features/plugins/partials/ds_edit.html
index f0bb8867f83..41605a99d02 100644
--- a/public/app/features/plugins/partials/ds_edit.html
+++ b/public/app/features/plugins/partials/ds_edit.html
@@ -31,11 +31,16 @@
       </div>
     </div>
 
-    <div class="alert alert-info gf-form-group" ng-if="ctrl.datasourceMeta.state === 'alpha'">
+    <div class="grafana-info-box" ng-if="ctrl.datasourceMeta.state === 'alpha'">
       This plugin is marked as being in alpha state, which means it is in early development phase and
       updates will include breaking changes.
     </div>
 
+		<div class="grafana-info-box" ng-if="ctrl.datasourceMeta.state === 'beta'">
+      This plugin is marked as being in a beta development state. This means it is in currently in active development and could be
+      missing important features.
+    </div>
+
     <rebuild-on-change property="ctrl.datasourceMeta.id">
       <plugin-component type="datasource-config-ctrl">
       </plugin-component>
diff --git a/public/app/plugins/datasource/stackdriver/plugin.json b/public/app/plugins/datasource/stackdriver/plugin.json
index 9216114b0e8..85672aacf2a 100644
--- a/public/app/plugins/datasource/stackdriver/plugin.json
+++ b/public/app/plugins/datasource/stackdriver/plugin.json
@@ -5,6 +5,7 @@
   "metrics": true,
   "alerting": true,
   "annotations": false,
+  "state": "beta",
   "queryOptions": {
     "maxDataPoints": true,
     "cacheTimeout": true