Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mysql changes - all the mysql related patches from the atomic spec #249

Merged
merged 9 commits into from
Sep 14, 2014

Conversation

jrossi
Copy link
Member

@jrossi jrossi commented Jul 13, 2014

This a group of changes related to mysql that have been used in atomic rpm for some time.

@atomicturtle If you have sometime could you detail what this all is for the release notes.

@jrossi
Copy link
Member Author

jrossi commented Jul 22, 2014

@ossec as the submitter I can it accept. @atomicturtle uses this in the rpm and we need to get the rpm and src installs to be the same code.

@ddpbsd
Copy link
Member

ddpbsd commented Jul 22, 2014

I don't use mysql, or I would test this. If I get some free time I'll try to setup an instance.

@jrossi
Copy link
Member Author

jrossi commented Sep 2, 2014

merging this unto master - should pass travis now.

@jrossi jrossi added this to the ossec-hids-2.9 milestone Sep 2, 2014
@jrossi
Copy link
Member Author

jrossi commented Sep 2, 2014

I would like to get this pulled in before 2.9 so that we can make sure that the code in RPM's match the source release. We should not be calling atomic rpm the same till this happens. <-- going forward ;) i just want to make sure that we release the same code for everything.

Please review @ossec

@atomicturtle
Copy link
Member

ossec-hids-mysql-schema-fix1.patch
- removes the index on cat_name

consolidate-alert-mysql-2
- changes dbd to consolidate the alert & data tables into a single table, alert
- adds the alertid field

os_dbd-mysql-replace-query.patch
- drops the select/(insert|update) logic from dbd and replaces it with the faster REPLACE syntax for the signature table

mysql-schema-if-exists.patch
- add IF NOT EXISTS logic to table creation

mysql-schema-is_hidden.patch
- add is_hidden column to alerts table. Used by ASL

mysql-disable-max-id.patch
- drop the arbintrary db_Config->alert_id counter. This mapped to nothing, and caused conflicts with alertid
- update type from smallint to int in schema, and added autoincrement to alert

mysql-schema-tld.patch
- add TLD placeholder to schema (used in ASL)

disable-signature-sql.patch
- disable the signature table generation completely for performance reasons. When enabled this can increase ossec-dbd startup times to well over 10 minutes

@jrossi
Copy link
Member Author

jrossi commented Sep 14, 2014

@ossec i can not accept this as i created the Pull Request. Someone else will need to review and accept. I am not worried much as atomic is shipping this now to customers, but we should review it anyway.

@awiddersheim
Copy link
Member

I don't know enough about the database stuff to review confidently.

@awiddersheim
Copy link
Member

Is @atomicturtle not able to do review and merge this? He seems like the most logical person.

@jrossi
Copy link
Member Author

jrossi commented Sep 14, 2014

We are in a weird place - he is also the author. I will move then in soon if someone does not review them soon. Like I said we are shipping this in the RPM's right now.

@awiddersheim
Copy link
Member

If you are confident and he is confident than I am confident. Merging.

awiddersheim added a commit that referenced this pull request Sep 14, 2014
All of the MySQL related patches from the atomic spec
@awiddersheim awiddersheim merged commit 1619db7 into ossec:master Sep 14, 2014
@jrossi jrossi deleted the atomic-mysql-schema-changes branch September 24, 2014 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants