🦜 Support for binary builds 🦜

charts/pelorus/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 1.4.6
+version: 1.4.7
 
 dependencies:
   - name: exporters
-    version: "v1.3.0"
+    version: "v1.3.1"

charts/pelorus/charts/exporters/Chart.yaml

@@ -1,3 +1,3 @@
 name: exporters
-version: v1.3.0
+version: v1.3.1
 apiVersion: v2

charts/pelorus/templates/dashboard-sdp-byapp.yaml

@@ -5,8 +5,8 @@ metadata:
   name: dashboard-sdp-byapp
   labels:
     app: grafana
+    monitoring-key: grafana
 spec:
-  name: devops.json
   json: >-
     {
     "annotations": {

charts/pelorus/templates/dashboard-sdp.yaml

@@ -5,8 +5,8 @@ metadata:
   name: dashboard-sdp
   labels:
     app: grafana
+    monitoring-key: grafana
 spec:
-  name: devops.json
   json: >-
     {
     "annotations": {

exporters/committime/README.md

@@ -27,3 +27,24 @@ Then we get commit data from the following systems through their respective APIs
 * GitHub Enterprise (including private endpoints)
 * Bitbucket _(coming soon)_
 * Gitlab _(coming soon)_
+
+## Binary Build Support
+
+OpenShift binary builds are a popular mechanism for building container images on OenShift but do not contain source code information.
+
+To support these types of build, you may annotate the build phase with the following annotations for pelorus to use:
+
+| Annotation                      | Example                           | Description                   |
+|---------------------------------|:----------------------------------|------------------------------:|
+| buildSpecRevisionGitCommit      | cae392a                           | Short or Long Git Commit Hash |
+| buildSpecSourceGitUri           | https://github.com/org/myapp.git  | URL of the Source Repository  |
+| buildSpecRevisionGitAuthorName  | joe.bloggs                        | Name of the committer         |
+
+Example command to put in your build pipeline each time you start an OpenShift `Build`:
+
+```bash
+oc annotate bc/${BUILD_CONFIG_NAME} --overwrite \
+  buildSpecSourceGitUri=${GIT_URL} \
+  buildSpecRevisionGitCommit=${GIT_COMMIT} \
+  buildSpecRevisionGitAuthorName="${GIT_AUTHOR}"
+```

exporters/committime/collector_base.py

@@ -182,7 +182,11 @@ def get_metric_from_build(self, build, app, namespace, repo_url):
                     repo_url = self._get_repo_from_build_config(build)
 
             metric.repo_url = repo_url
-            commit_sha = build.spec.revision.git.commit
+
+            if build.spec.revision is None:
+                commit_sha = self._get_revision_from_build(build)
+            else:
+                commit_sha = build.spec.revision.git.commit
             metric.build_name = build.metadata.name
             metric.build_config_name = build.metadata.labels.buildconfig
             metric.namespace = build.metadata.namespace
@@ -191,7 +195,12 @@ def get_metric_from_build(self, build, app, namespace, repo_url):
 
             metric.commit_hash = commit_sha
             metric.name = app
-            metric.committer = build.spec.revision.git.author.name
+
+            if build.spec.revision is None:
+                metric.committer = self._get_author_from_build(build)
+            else:
+                metric.committer = build.spec.revision.git.author.name
+
             metric.image_location = build.status.outputDockerImageReference
             metric.image_hash = build.status.output.to.imageDigest
             # Check the cache for the commit_time, if not call the API
@@ -264,6 +273,9 @@ def _get_repo_from_build_config(self, build):
         build_config = v1_build_configs.get(
             namespace=build.status.config.namespace, name=build.status.config.name
         )
+        if build.metadata.annotations.buildSpecSourceGitUri:
+            return build.metadata.annotations.buildSpecSourceGitUri
+
         if build_config:
             if build_config.spec.source.git:
                 git_uri = str(build_config.spec.source.git.uri)
@@ -273,3 +285,25 @@ def _get_repo_from_build_config(self, build):
                     return git_uri + ".git"
 
         return None
+
+    def _get_revision_from_build(self, build):
+        """
+        Determines the git revision from the parent BuildConfig
+        :param build: the Build resource
+        :return: revisions as a str or None if not found
+        """
+        if build.metadata.annotations.buildSpecSourceGitUri:
+            return build.metadata.annotations.buildSpecRevisionGitCommit
+
+        return None
+
+    def _get_author_from_build(self, build):
+        """
+        Determines the git author from the parent BuildConfig
+        :param build: the Build resource
+        :return: author as a str or None if not found
+        """
+        if build.metadata.annotations.buildSpecRevisionGitAuthorName:
+            return build.metadata.annotations.buildSpecRevisionGitAuthorName
+
+        return None

exporters/pelorus/__init__.py

@@ -24,7 +24,7 @@
 logging.basicConfig(
     format=DEFAULT_LOG_FORMAT, datefmt=DEFAULT_LOG_DATE_FORMAT, level=numeric_level
 )
-print("Initializing Logger wit LogLevel: %s" % loglevel.upper())
+print("Initializing Logger with LogLevel: %s" % loglevel.upper())
 
 # A NamespaceSpec lists namespaces to restrict the search to.
 # Use None or an empty list to include all namespaces.