Skip to content

Conversation

@crawford
Copy link
Contributor

This series reports what installed the cluster. In order to do this, the
openshift-install ConfigMap, which is written by the installer when
doing an IPI install, is read. This ConfigMap is only injected during an
IPI installation and contains the invoker (e.g. username, Hive) as well
as the openshift-install version. The absence of this ConfigMap implies
a UPI installation.

Because the data in this series never changes, it should compress
nicely so we shouldn't have to worry about wasting space.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 26, 2019
@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 26, 2019
@crawford
Copy link
Contributor Author

Needs openshift/telemeter#189 before we can see the results.

@crawford
Copy link
Contributor Author

/cc @smarterclayton

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 28, 2019
@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2019
crawford added 2 commits July 19, 2019 19:42
Back in 6c1716f, we dropped the direct dependency on glog, which
resulted in `dep ensure` showing the following warning:

    Warning: the following project(s) have [[constraint]] stanzas in
    Gopkg.toml:

      ✗  github.com/golang/glog

It also resulted in the constraint no longer being respected
(`[[override]]` is required for transitive dependencies). Since we have
been using a newer version of glog for almost two months now, I'm
dropping the constraint instead of converting into an override.
@openshift-ci-robot openshift-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 20, 2019
@crawford
Copy link
Contributor Author

/test ci/prow/e2e-aws

1 similar comment
@crawford
Copy link
Contributor Author

/test ci/prow/e2e-aws

@crawford
Copy link
Contributor Author

/test e2e-aws

@crawford
Copy link
Contributor Author

The metrics appear to be working:

image

/retitle metrics: add cluster_installer series

@openshift-ci-robot openshift-ci-robot changed the title WIP: metrics: add cluster_installer series metrics: add cluster_installer series Jul 21, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 21, 2019
}, []string{"name", "condition"}),
clusterInstaller: prometheus.NewGaugeVec(prometheus.GaugeOpts{
Name: "cluster_installer",
Help: "Reports the installation method for the cluster",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this supposed to have UPI vs IPI?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you'd want to return 1 / 0 if this is about IPI vs UPI, or 1 always if you have a label for UPI. Recommend documenting your labels in this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, it's a bit more than that. You can derive UPI vs IPI from it, but you can also look at what invoked the installer (e.g. Hive). I can filled out that help text a bit more though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, so now I'm confused. Is type=UPI the label? Expected to see a test with that as an example (just so we know).

Might want to update metrics.md too once you finalize.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated metrics.md. Can you let me know if it makes sense now?

This series reports what installed the cluster. In order to do this, the
openshift-install ConfigMap, which is written by the installer when
doing an IPI install, is read. This ConfigMap is only injected during an
IPI installation and contains the invoker (e.g. username, Hive) as well
as the openshift-install version. The absence of this ConfigMap implies
a UPI installation. This data will allow us to determine whether a
cluster was installed IPI or UPI and, once CI and Hive have been
updated, whether the cluster was created by CI or Hive.

Because the data in this series never changes, it should compress
nicely so we shouldn't have to worry about wasting space.

If the data in the ConfigMap is missing, those label values are reported
as `<missing>`. That was used instead of an empty value in order to
distinguish between normal operation and an anomalous state. If the
openshift-install ConfigMap exists, it will have all of those fields
specified unless something were to erroneously remove them.
@smarterclayton
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 22, 2019
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: crawford, smarterclayton

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [crawford,smarterclayton]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

17 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@smarterclayton
Copy link
Contributor

/retest

@openshift-merge-robot openshift-merge-robot merged commit 210264a into openshift:master Jul 23, 2019
@crawford crawford deleted the installer branch July 23, 2019 18:20
@openshift-ci-robot
Copy link
Contributor

@crawford: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws c147732 link /test e2e-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@wking
Copy link
Member

wking commented Jul 26, 2019

Cross-linking openshift/installer#1890 and openshift/installer#2046 which are injecting this information into the cluster.

@crawford
Copy link
Contributor Author

crawford commented Aug 5, 2019

/cherrypick release-4.1

@openshift-cherrypick-robot

@crawford: #213 failed to apply on top of branch "release-4.1":

Applying: vendor: add informers from kube client-go
Applying: metrics: add cluster_installer series
error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
M	pkg/cvo/cvo.go
M	pkg/cvo/cvo_test.go
M	pkg/start/start.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/start/start.go
CONFLICT (content): Merge conflict in pkg/start/start.go
Auto-merging pkg/cvo/cvo_test.go
Auto-merging pkg/cvo/cvo.go
CONFLICT (content): Merge conflict in pkg/cvo/cvo.go
Patch failed at 0003 metrics: add cluster_installer series

Details

In response to this:

/cherrypick release-4.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants