Skip to content

Conversation

@shreyb
Copy link
Contributor

@shreyb shreyb commented Nov 9, 2023

Given how this PR looks, we'll definitely need to go through and make sure things look the same. The BFG tool replaced hostnames with the string ***REMOVED***, which was changed in the following files:

        condor_mapfile                           
        customize.sh                                                   
        default.local                                         
        filebeat.yml                                        
        glideinwms.libsonnet        
        graphite.py                                               
        job_classification.libsonnet                                   
        logstash.conf                                                
        logstash.conf.digest                                           
        resource_request.jsonnet                  
        script_to_follow_GCloud                                   
        setup.py                

We definitely shouldn't rush this PR - it's worth it to take our time, and if another PR needs to go in before this, the instructions are pretty easy to replicate (https://rtyley.github.io/bfg-repo-cleaner/).

mapsacosta and others added 30 commits March 9, 2021 14:03
adding launcher and cvmfsexec wrapper for Stampede2
add Frontera launcher and cvmfs wrapper
Filebeat and first portion of kafka configs
Add template configuration files for integration test
Reorganized configuration templates and added condor_mapfile
Added instructions for basic setup of filebeat
Added steps for basic setup of digest topic logstash
Add documentation for store directory
Copy link

@StevenCTimm StevenCTimm left a comment

Choose a reason for hiding this comment

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

I don't understand this commit at all, this looks like 118 totally new files.
What is going on.. it says there are 118 file changes but they almost all appear
to be all new files with just minimal +/- how do we tell what you changed?

@shreyb
Copy link
Contributor Author

shreyb commented Nov 9, 2023

I agree, @StevenCTimm - so the BFG goes through all the past commits and any of the commits that had a hostname, would have to change, which means a new commit hash. I think this is why github thinks lots of files have changed that haven't. I'm going to go through and resolve all the merge conflicts, then see if there's a good way to figure out what actually needs reviewing and what doesn't.

I did put in the description of the PR which files were actually marked by the tool as being changed, so maybe that's a start.

@shreyb
Copy link
Contributor Author

shreyb commented Nov 9, 2023

Merge conflicts resolved.

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.

8 participants