Skip to content

Conversation

ewolinetz
Copy link
Contributor

This is to address https://bugzilla.redhat.com/show_bug.cgi?id=1316216

Need to update documentation to better describe upgrade path and running of the uuid_migration script.

In the mean time comments welcome @richm @sosiouxme @jcantrill

@@ -4,7 +4,7 @@
<record>
hostname ${(kubernetes_host rescue nil) || File.open('/etc/docker-hostname') { |f| f.readline }.rstrip}
message ${log}
version 1.0.6
version 1.1.4
Copy link
Contributor

Choose a reason for hiding this comment

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

I see we are bumping these versions here. Are they needed for the PR or is it just an opportunity to upgrade?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So this is just a marker for the data. Since we're making some bigger
changes like adding new data and changing the index formatting this was an
appropriate time to up this version.
On Mar 22, 2016 8:01 AM, "Jeff Cantrill" [email protected] wrote:

In fluentd/configs.d/filter/k8s_record_transform.conf
#98 (comment)
:

@@ -4,7 +4,7 @@

hostname ${(kubernetes_host rescue nil) || File.open('/etc/docker-hostname') { |f| f.readline }.rstrip}
message ${log}

  • version 1.0.6
  • version 1.1.4

I see we are bumping these versions here. Are they needed for the PR or is
it just an opportunity to upgrade?


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub
https://github.com/openshift/origin-aggregated-logging/pull/98/files/15769affe2fb22e7a8cdb1660ed0b2fe125879b5#r56981288

@ewolinetz ewolinetz changed the title [WIP] Uuid indices Uuid indices Mar 22, 2016
@ewolinetz
Copy link
Contributor Author

Addressed suggestions made by Rich and added to the README to expand on the migration path

@ewolinetz
Copy link
Contributor Author

[test]

fi

OPS_PROJECTS=("default" "openshift" "openshift-infra")
PROJECTS=(oc get project -o jsonpath='{.items[*].metadata.name}')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this needs to be in ticks

@ewolinetz ewolinetz force-pushed the uuid_indices branch 2 times, most recently from 9999d50 to 73cb6eb Compare March 23, 2016 15:29
@ewolinetz
Copy link
Contributor Author

[test]

@ewolinetz
Copy link
Contributor Author

@sosiouxme @richm @jcantrill PTAL


Be sure to delete your routes and oauth client

$ oc delete route,oauthclient --selector logging-infra=support
Copy link
Member

Choose a reason for hiding this comment

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

I think we should really just update the code to delete the route as well. But the oauthclient, yeah, they need to do that :(

@sosiouxme
Copy link
Member

I wish I had more time to look at this today, but I probably won't. I've had time to at least glance over most of it and I don't have any qualms at this point.

@ewolinetz
Copy link
Contributor Author

[test]

1 similar comment
@ewolinetz
Copy link
Contributor Author

[test]

@@ -262,7 +262,8 @@ fi

if [ "${KEEP_SUPPORT}" != true ]; then
oc delete template --selector logging-infra=support
oc process -f templates/support.yaml -v "OAUTH_SECRET=$(cat $dir/oauth-secret),KIBANA_HOSTNAME=${hostname},KIBANA_OPS_HOSTNAME=${ops_hostname},IMAGE_PREFIX=${image_prefix},IMAGE_VERSION=${image_version}" | oc create -f -
oc process -f templates/support.yaml -v "OAUTH_SECRET=$(cat $dir/oauth-secret),KIBANA_HOSTNAME=${hostname},KIBANA_OPS_HOSTNAME=${ops_hostname}" | oc create -f -
oc process -f templates/images.yaml -v "IMAGE_PREFIX=${image_prefix},IMAGE_VERSION=${image_version}" | oc create -f -
Copy link
Contributor

Choose a reason for hiding this comment

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

indentation

@richm
Copy link
Contributor

richm commented Mar 29, 2016

Would you please squash these into a single commit?

@ewolinetz ewolinetz changed the title Uuid indices [DO_NOT_MERGE] Uuid indices Mar 29, 2016
@ewolinetz ewolinetz force-pushed the uuid_indices branch 2 times, most recently from 3256430 to c34b546 Compare March 29, 2016 15:12
@ewolinetz
Copy link
Contributor Author

[test]

@ewolinetz
Copy link
Contributor Author

[test]

@ewolinetz
Copy link
Contributor Author

[test]

@openshift-bot
Copy link

Evaluated for aggregated logging test up to 1e627fe

@openshift-bot
Copy link

Aggregated Logging Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test-origin-aggregated-logging/101/)

@ewolinetz
Copy link
Contributor Author

now doing migration script testing in addition to our previous tests. PTAL

@richm
Copy link
Contributor

richm commented Mar 31, 2016

lgtm

@richm
Copy link
Contributor

richm commented Mar 31, 2016

I think addition of the system.admin with "superuser" privileges should be in a separate commit, based on the feedback we are getting on the lack of curator in current versions.

@ewolinetz
Copy link
Contributor Author

@richm that just impacts OSE though right? We have those changes already in place and they are currently ON_QA for https://bugzilla.redhat.com/show_bug.cgi?id=1316216

@richm
Copy link
Contributor

richm commented Mar 31, 2016

@ewolinetz yes, so it's not really needed for origin. In general, it's bad to address multiple bugs/features in a single patch, because it is much harder to construct an audit trail, backport/cherry pick, etc. I guess in this case it's ok, as long as we can document what to do for OSE users.

@ewolinetz
Copy link
Contributor Author

@richm agreed, this PR became very large very quick and that admin user change was caught up in it unfortunately.

@sosiouxme
Copy link
Member

Probably don't need to squash everything to one commit, can keep them
broken out by major features/bugs. We just don't want to see a dozen fiddly
commits on the same thing.

On Thu, Mar 31, 2016 at 5:50 PM, Eric Wolinetz [email protected]
wrote:

@richm https://github.com/richm agreed, this PR became very large very
quick and that admin user change was caught up in it unfortunately.


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#98 (comment)

sosiouxme added a commit to sosiouxme/openshift-docs that referenced this pull request Apr 1, 2016
@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

7 similar comments
@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@richm
Copy link
Contributor

richm commented Apr 1, 2016

aos-ci-test

@sosiouxme
Copy link
Member

LGTM

@ewolinetz ewolinetz merged commit eeddd3d into openshift:master Apr 1, 2016
ahardin-rh pushed a commit to ahardin-rh/openshift-docs that referenced this pull request Apr 4, 2016
@ewolinetz ewolinetz deleted the uuid_indices branch April 12, 2016 19:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants