resolve merge conflicts (#6)

Co-authored-by: sonali623 <[email protected]>

Gruntfile.js

@@ -94,4 +94,4 @@ module.exports = function(grunt) {
     'copy:dist_img',
     'copy:dist_statics'
   ]);
-};
+};

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Patel, Sonali [Engineering]
+   Copyright 2024 Goldman Sachs
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -198,4 +198,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

NOTICE

@@ -2,4 +2,4 @@ Pulse Telemetry API Plugin
 
 Copyright 2024 Goldman Sachs
 
-The project is licensed under the Apache License.
+The project is licensed under the Apache License.

package.json

@@ -36,4 +36,4 @@
     "ts-node": "^10.7.0",
     "typescript": "^2.9.2"
   }
-}
+}

specs/datasource.spec.ts

@@ -115,4 +115,4 @@ describe('Datasource', function () {
     sinon.assert.match(actualAutoInterval, expectedAutoInterval);
   });
 
-});
+});

src/config_ctrl.ts

@@ -19,4 +19,4 @@ export class ApiConfigCtrl {
 
   constructor($scope) {
   }
-}
+}

src/datasource.ts

@@ -535,4 +535,4 @@ export default class TimeseriesApiDatasource {
     return 'just now';
   }
 
-}
+}

src/module.ts

@@ -31,4 +31,4 @@ export {
   ApiConfigCtrl as ConfigCtrl,
   ApiQueryOptionsCtrl as QueryOptionsCtrl,
   ApiAnnotationsQueryCtrl as AnnotationsQueryCtrl
-};
+};

src/partials/annotations.editor.html

@@ -18,6 +18,4 @@ <h5 class="section-heading">Query</h5>
   <div class="gf-form">
     <input type="text" class="gf-form-input" ng-model='ctrl.annotation.query' placeholder=""></input>
   </div>
-</div>
-
-
+</div>

src/partials/config.html

@@ -28,4 +28,4 @@ <h3 class="page-heading">Extra Fields Needed For This Plugin</h3>
       </info-popover>
     </div>
   </div>
-</div>
+</div>

src/partials/query.editor.html

@@ -107,4 +107,4 @@
 
 
   </div>
-</query-editor-row>
+</query-editor-row>

src/partials/query.options.html

@@ -16,4 +16,4 @@
 <section class="grafana-metric-options" >
   <div class="gf-form">
   </div>
-</section>
+</section>

src/plugin.json

@@ -26,4 +26,4 @@
     "version": "1.0.0",
     "updated": "2024-05-22"
   }
-}
+}

src/query_ctrl.ts

@@ -137,4 +137,4 @@ export class ApiDatasourceQueryCtrl extends QueryCtrl {
     // This closes the dropdown
     this.addTagMode = false;
   }
-}
+}

src/suggestion.ts

@@ -313,4 +313,4 @@ export default class Suggestion {
   removeWhitespace(string) {
     return string.replace(/\s/g, "");
   }
-}
+}

tsconfig.json

@@ -21,4 +21,4 @@
     "esm": true,
     "experimentalSpecifierResolution": "node"
   }
-}
+}